账单信息

hdApp/src/admin/ghs/pay.vue

@@ -147,12 +147,7 @@
 			}
 		},
 		onLoad() {
-			// H5 扫码付款页可能无门店登录态，globalMixins 不会调 init，此处补一次
-			// #ifdef H5
-			if (this.$util.isEmpty(this.getLoginInfo)) {
-				this.init()
-			}
-			// #endif
+			this.loadGhsData(false)
 		},
 		onShow() {
 			this.pageShowCount += 1
@@ -163,7 +158,6 @@
 		},
 		methods: {
 			init() {
-				this.loadGhsData(false)
 			},
 			// 解析路由参数 id/salt
 			parsePayPageParams() {

hdApp/src/pagesPurchase/gathering.vue

@@ -84,6 +84,7 @@ export default {
   },
   onLoad() {
     this.device = uni.getSystemInfoSync().platform
+    this.initData()
   },
   onShow () {
     if (this.ghsId) {
@@ -180,7 +181,6 @@ export default {
       }
     },
     init() {
-      this.initData()
     },
     initData () {
       let id = 0

hdApp/src/pagesPurchase/purDetails.vue

@@ -164,14 +164,14 @@
               :key="billIndex"
               class="order-clear-bills__link"
               @click.stop="goClearBill(bill)"
-            >{{ bill.clearSn ? bill.clearSn : ('结账单' + (billIndex + 1)) }}<text v-if="Number(bill.amount)>0" class="order-clear-bills__amt"> 本单销¥{{ parseFloat(bill.amount) }}</text></text>
+            >{{ bill.clearSn ? bill.clearSn : ('结账单' + (billIndex + 1)) }}<text v-if="Number(bill.amount)>0" class="order-clear-bills__amt"> ¥{{ parseFloat(bill.amount) }}</text></text>
           </view>
         </view>
 
         <view class="order-info_box" style="margin-top:35upx;" v-if="Number(detailInfo.remainDebtAmount)>0 && detailInfo.showForPay==1">
           <view>累计待结：</view>
           <view style="font-weight:bold;color:red;font-size:29upx;">¥{{detailInfo.remainDebtAmount?parseFloat(detailInfo.remainDebtAmount):0}}</view>
-          <view class="price" v-if="loginStyle != 0">
+          <view class="price">
             <button @click="goToSettle(detailInfo)" class="admin-button-com" style="padding:20upx 15upx;" v-if="detailInfo.remainDebtAmount>0">
             选订单结账
             </button>
@@ -550,19 +550,11 @@ export default {
 		},
     //跳转到结账页
     goToSettle (item) {
-      this.pageTo({
-        url: '/pagesPurchase/gathering?id='+item.supplierId
-      })
-    },
-    goToRecharge(info){
-      this.pageTo({url: '/admin/ghs/pay?id='+info.ghsId+'&salt='+info.ghsSalt})
+      this.pageTo({url: '/pagesPurchase/gathering?id='+item.supplierId+'&salt='+item.ghsSalt})
     },
     goClearBill(item) {
-      const id = item && item.clearId ? item.clearId : 0
-      if (!id) {
-        return
-      }
-      this.pageTo({ url: '/admin/clear/info', query: { id } })
+      let salt = item.salt ? item.salt : ''
+      this.pageTo({ url: '/admin/clear/info?id='+item.clearId+'&salt='+salt})
     },
     copy (val) {
       const self = this;
@@ -715,15 +707,12 @@ export default {
     }
     .order-clear-bills__link {
       color: #3385ff;
-      font-weight: bold;
       margin-right: 20upx;
-      margin-bottom: 15upx;
     }
     .order-clear-bills__amt {
       font-weight: normal;
       font-size: 28upx;
-      margin-left: 20upx;
-      font-weight: bold;
+      margin-left:10upx;
     }
   }
   .content-box {