Merge branch 'master' of http://47.99.76.149:3000/baokemeng/uniAppXCX

api/coupon.js

@@ -1,6 +1,6 @@
 import { request } from '@/api/config.js'
 
-// 我的优惠卷列表
+// 我的优惠券列表
 export function couponListApi(data) {
   return request({
     url: '/wx/coupon/mylist',

component/paymentPopup.vue

@@ -28,7 +28,7 @@
           </view>
         </view>
         <view class="row">
-          <view class="label">优惠卷</view>
+          <view class="label">优惠券</view>
           <view class="value">
             <view v-if="!selestCouponId && couponList.length > 0" class="hasCoupon" @click="showPopup3">
               选择优惠券

pages/index2/index.vue

@@ -9,7 +9,7 @@
       padding-bottom: 80px;
     "
   >
-    <img src="https://file.rongcyl.cn/festatic/bkm/banner.png" class="w-full" />
+    <img src="https://file.rongcyl.cn/festatic/bkm/banner.png" class="w-full" style="height: 400rpx" />
     <div
       style="
         background: rgba(0, 0, 0, 0.85);

pages/mine/mine.vue

@@ -38,7 +38,7 @@
           <view class="value">
             {{ userInfoDetail.couponNum || 0 }}
           </view>
-          <view class="label">优惠卷</view>
+          <view class="label">优惠券</view>
         </view>
       </view>
     </view>

pages/task/index.vue

@@ -20,6 +20,9 @@
         'padding-bottom': '160rpx',
       }"
     >
+      <div class="flex items-center pl-2">
+        <img @click="goBack" src="https://file.rongcyl.cn/festatic/bkm/back.png" style="height: 32px; width: 32px" />
+      </div>
       <div class="card rounded-md shadow-sm mx-auto mt-10 py-2">
         <div class="fs16 bold italic text-gray-900 pl-3 my-2">签到赚积分</div>
         <div class="flex justify-between text-black px-3">
@@ -107,6 +110,11 @@ export default {
     this.getTaskStat()
   },
   methods: {
+    goBack() {
+      wx.navigateBack({
+        delta: 1,
+      })
+    },
     reveiveTaskReward() {
       if (this.status == 2) {
         return
@@ -158,7 +166,8 @@ export default {
       })
     },
     sign(i) {
-      if (i == this.todayIndex) {
+      console.log(this.signList[i].status)
+      if (i == this.todayIndex && !this.signList[i].status) {
         signToday().then(this.getList)
         wx.showToast({
           title: '签到成功',