shish 11 months ago
parent
commit
193b13d11f

+ 8 - 0
hdApp/src/admin/ghs/addGhs.vue

@@ -30,6 +30,14 @@ export default {
       }
     };
   },
+  onLoad () {
+
+    //返回上一页时刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.refreshPage = 1
+
+  },
   methods: {
     init(){
 

+ 1 - 1
hdApp/src/admin/member/detail.vue

@@ -1074,7 +1074,7 @@ export default {
     width: 100%;
     padding: 20upx 0;
     border-top: 1upx solid #f5f5f5;
-    background-color: #f8f9fa;
+    background-color: #e0dfdf;
     border-radius: 0 0 10upx 10upx;
     margin-top: 20upx;
     .balance-detail-row {

+ 6 - 6
hdApp/src/pagesPurchase/gatherPay.vue

@@ -21,18 +21,18 @@
         <block>
           <div class="call-one-btn">
             <block v-if="orderTime>0">
-              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:50upx;color:red;font-weight:bold;">请确认收到花材质量没有问题</view>
-              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;">欠款单付清后,将无法再申请售后</view>
-              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;">确认没问题,点下方按钮付款</view>
+              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:50upx;color:red;font-weight:bold;" v-if="live == 1">请确认收到花材质量没有问题</view>
+              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;" v-if="live == 1">欠款单付清后,将无法再申请售后</view>
+              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;" v-if="live == 1">确认没问题,点下方按钮付款</view>
 
-              <button class="button-com green pay-wx" @click="wxPayFn(1)" style="height:100upx;line-height:50upx;">微信支付</button>
+              <button class="button-com green pay-wx" @click="wxPayFn(1)" style="height:100upx;line-height:50upx;" v-if="live == 1">微信支付</button>
 
               <!-- #ifdef MP-WEIXIN -->
-              <button class="button-com ali-btn" @click="useAliPay" style="margin-top:65upx;height:100upx;line-height:50upx;">用支付宝付款</button>
+              <button class="button-com ali-btn" @click="useAliPay" style="margin-top:65upx;height:100upx;line-height:50upx;" v-if="live == 1">用支付宝付款</button>
               <!-- #endif -->
 
               <!-- #ifdef APP-PLUS -->
-              <button class="button-com green pay-wx ali-btn" @click="aliPay()">支付宝支付</button>
+              <button class="button-com green pay-wx ali-btn" @click="aliPay()" v-if="live == 1">支付宝支付</button>
               <!-- #endif -->
 
               <button class="button-com green pay-wx" @click="wxHasPay()" v-if="live == 0" style="height:100upx;line-height:50upx;margin-top:50upx;">微信线下已付</button>

+ 10 - 4
hdApp/src/pagesPurchase/order.vue

@@ -178,7 +178,8 @@ export default {
       supplierList: [],
       ad:[],
       currentGhs:{},
-      displaySupplierList: [] // 用于显示在弹框中的供货商列表
+      displaySupplierList: [],
+      refreshPage:0
     }
   },
   onPullDownRefresh() {
@@ -189,6 +190,12 @@ export default {
   computed: {
     ...mapGetters({ dictInfo:"getDictionariesInfo" })
   },
+  onShow(){
+    if(this.refreshPage == 1){
+      this.init()
+      this.refreshPage = 0
+    }
+  },
   methods: {
 		closeToShow(){
 			this.$refs.toShowMore.close()
@@ -317,9 +324,8 @@ export default {
       this.$util.confirmModal({content:'付款金额不足消欠款单时,存为余额下次使用'},() => {})
     },
     init() {
-      this.getMyGhsData().then(() => {
-        this.toRemindCustom()
-      })
+      this.getMyGhsData()
+      this.toRemindCustom()
     },
     toRemindCustom(){
       hasMoreGhs().then(ret=>{