Merge branch 'feature/mall_product'

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml

@@ -106,7 +106,7 @@
         e.name as tenantName,
         a.out_trade_no,
         a.pay_time,
-        b.nickname,
+        a.real_name as nickname,
         a.real_name,
         a.uid,
         a.user_phone,

yudao-ui-app/pages/member_application/index.vue

@@ -75,13 +75,13 @@
             icon: "icon-weixinzhifu",
             value: 'WXPAY',
             title: '微信快捷支付'
-          },
-          {
-            name: "支付宝",
-            icon: "icon-zhifubao",
-            value: 'ALIPAY',
-            title: '支付宝快捷支付'
           }
+          // {
+          //   name: "支付宝",
+          //   icon: "icon-zhifubao",
+          //   value: 'ALIPAY',
+          //   title: '支付宝快捷支付'
+          // }
         ],
         pay_close: false,
         activeIndex: [],

yudao-ui-app/pages/member_equity/index.vue

@@ -56,7 +56,7 @@
           </view>
           <view class="money-box money-time">
             <text>返费结束时间</text>
-            <text class="money-text">{{item.endTime}}</text>
+            <text class="money-text">{{dateConvert(item.startTime)}}</text>
          </view>
                </view>
              </view>
@@ -136,6 +136,18 @@
       this.equityData = equity.data
     },
     methods: {
+      dateConvert(date){
+        const _date = new Date(date)
+        _date.setFullYear(_date.getFullYear() + 1)
+        _date.setDate(_date.getDate() - 30)
+        const Y = _date.getFullYear() + "-"
+        const M =
+          (_date.getMonth() + 1 < 10
+            ? "0" + (_date.getMonth() + 1)
+            : _date.getMonth() + 1) + "-";
+        const D = (_date.getDate() < 10 ? "0" + _date.getDate() : _date.getDate())
+        return Y + M + D
+      },
       handleDetailed(reportId){
         uni.navigateTo({
           url:`/pages/member_detail/index?reportId=${reportId}`,

yudao-ui-app/pages/member_others/index.vue

@@ -88,13 +88,13 @@
             icon: "icon-weixinzhifu",
             value: 'WXPAY',
             title: '微信快捷支付'
-          },
-          {
-            name: "支付宝",
-            icon: "icon-zhifubao",
-            value: 'ALIPAY',
-            title: '支付宝快捷支付'
           }
+          // {
+          //   name: "支付宝",
+          //   icon: "icon-zhifubao",
+          //   value: 'ALIPAY',
+          //   title: '支付宝快捷支付'
+          // }
         ],
         pay_close: false,
         activeIndex: [],

yudao-ui-app/pages/member_renew/index.vue

@@ -83,13 +83,13 @@ import store from '@/store/index';
         		icon: "icon-weixinzhifu",
         		value: 'WXPAY',
         		title: '微信快捷支付'
-        	},
-        	{
-        		name: "支付宝",
-        		icon: "icon-zhifubao",
-        		value: 'ALIPAY',
-        		title: '支付宝快捷支付'
         	}
+        	// {
+        	// 	name: "支付宝",
+        	// 	icon: "icon-zhifubao",
+        	// 	value: 'ALIPAY',
+        	// 	title: '支付宝快捷支付'
+        	// }
         ],
         pay_close: false,
         activeIndex:[],

yudao-ui-app/pages/sale_performance/index.vue

@@ -71,7 +71,10 @@
                     <view>{{ item.grade }}</view>
                   </text>
                 </view>
-                <text>￥{{item.payPrice | currency}}</text>
+                <view class="price-wrap">
+                  <text style="display:block; margin-bottom: 6rpx;">￥{{item.payPrice | currency}}</text>
+                  <u-tag v-if="item.refundStatus === 2" plain  text="已退款" type="error"></u-tag>
+                </view>
               </view>
             </u-list-item>
           </u-list>