花店采购模块

hdApp/src/pagesPurchase/gatherPay.vue

@@ -11,14 +11,15 @@
             <i class="iconfont icondaizhifu"></i>
           </div>
         </block>
-        <view class="wait">待确认</view>
+        <view class="wait">待付款</view>
         <!-- 待支付 -->
         <block>
           <div class="price">
             <span>￥</span>
             <span class="app-size-36 app-bold">{{ actPrice || ''}}</span>
           </div>
-          <div class="order-num app-color-3">订单号: {{ orderSn || ''}}</div>
+          <div class="order-num app-color-3 order-show">订单号: {{ orderSn || ''}}</div>
+          <div class="order-num app-color-3 order-show">120秒后订单失效</div>
         </block>
         <block>
           <div class="call-one-btn">
@@ -81,7 +82,7 @@ export default {
     };
   },
   onLoad (options) {
-    this.getWeChat(options.id)
+    this.getWeChat(options.ids,options.id)
   },
   computed: {
     ...mapGetters(["getLoginInfo", 'getDictionariesInfo']),
@@ -89,9 +90,8 @@ export default {
   mounted () {
   },
   methods: {
-    getWeChat (id) {
-      // console.log(this.options.id)
-      purchaseClearCreateOrder({ id }).then(res => {
+    getWeChat (ids,id) {
+      purchaseClearCreateOrder({ purchaseIds:ids,ghsId:id }).then(res => {
         this.orderSn = res.data.orderSn
         this.actPrice = res.data.actPrice
       }).catch(err => { console.log(err) })
@@ -161,6 +161,9 @@ export default {
         }
       }
     }
+    .order-show{
+      margin-top:20rpx;
+    }
   }
 }
 // 待支付 - 公共

hdApp/src/pagesPurchase/gathering.vue

@@ -7,16 +7,13 @@
       </view>
       <view class="top-row">
         <view class="info-item">
-          <image
-            class="logo"
-            src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=3225163326,3627210682&fm=26&gp=0.jpg"
-          />
+          <image class="logo" src="" />
           <text class="name">
-            {{ customInfo.name || "1221" }}
+            {{ customInfo.name}}
           </text>
         </view>
         <view class="price-item">
-          {{ allTotalAmount || "121212" }}
+          {{ allTotalAmount}}
         </view>
       </view>
     </view>
@@ -77,8 +74,8 @@
         > 取消</button>
         <button
           :class="['admin-button-com', 'blue', 'global']"
-          @click="batchGathering"
-        >收款</button>
+          @click="batchConfirm"
+        >确认</button>
       </view>
       <view
         class="btn-view"
@@ -88,7 +85,7 @@
           class="admin-button-com blue"
           @click="isBatch = true"
         >
-          批量收款
+          批量结清
         </button>
       </view>
     </view>
@@ -175,7 +172,7 @@ export default {
     },
     // 初始化页面数据
     initData () {
-      purchaseDebtList().then(res => {
+      purchaseDebtList({id:this.option.id}).then(res => {
         console.log(res)
         this.detailsList = res.data.list.map(ele => {
           return {
@@ -201,14 +198,14 @@ export default {
       }
     },
     // 批量收款
-    batchGathering () {
+    batchConfirm () {
       let arr = []
       if (this.selectList.length > 0) {
         this.selectList.forEach(item => {
           arr.push(item.id)
         })
         uni.navigateTo({
-          url: '/pagesPurchase/gatherPay?id=' + arr.join(',')
+          url: '/pagesPurchase/gatherPay?ids=' + arr.join(',')+'&id='+this.option.id
         })
 
       }

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -172,7 +172,7 @@ export default {
 		return {
 			title: this.pageInfo.shopName,
 			desc: "",
-			path: `pagesPurchase/gshProudct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${this.options.ghsShopAdminId}&shopId=${this.options.shopId}`
+			path: `pagesPurchase/gshProudct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${this.option.ghsShopAdminId}&shopId=${this.option.shopId}`
 		}
 	},
   onShow() {

hdApp/src/pagesPurchase/order.vue

@@ -95,8 +95,8 @@ export default {
   },
   methods: {
     enter (item) {
-      const { id, ghsShopId, ghsSjId } = item
-      uni.navigateTo({ url: `/pagesPurchase/ghsProduct?shopId=${ghsShopId}&id=${id}` })
+      const { id } = item
+      uni.navigateTo({ url: `/pagesPurchase/ghsProduct?id=${id}` })
     },
     getGHSList () {
       ghsList().then(res => {
@@ -106,9 +106,8 @@ export default {
     },
     // 结账
     settleAccounts (item) {
-      console.log('点击了结账', item)
       uni.navigateTo({
-        url: '/pagesPurchase/gathering?avator=' + item.avatar + '&name=' + item.name
+        url: '/pagesPurchase/gathering?id='+item.id
       })
     },
     // 采购记录详情