更新

components/shortPopup.vue

@@ -62,7 +62,10 @@
           <view class="b_icon" @click="navgo(source==12 ? '/pages/nongKe/supply_chain/shopping_trolley_other?source='+source : '/pages/nongKe/supply_chain/shopping_trolley_a')">
             <image src="@/static/images/icon/car.png"></image>
             <view>采购车</view>
-            <view class="badge" v-if="goodsNum">{{goodsNum}}</view>
+            <view class="badge" v-if="goodsNum">
+              <text v-if="goodsNum<100">{{goodsNum}}</text>
+              <text v-else>99+</text>
+            </view>
           </view>
           <view class="btn" @click.stop="$u.throttle(addcart, 1500)">加入采购清单</view>
         </view>

pages.json

@@ -414,6 +414,15 @@
             "navigationStyle": "custom"
           }
 
+        },{
+          "path": "supply_chain/supplierOther",
+          "style": {
+            "enablePullDownRefresh": true,
+            "navigationBarTitleText": "",
+            "navigationBarBackgroundColor": "#e93323",
+            "navigationStyle": "custom"
+          }
+
         },
         {
           "path": "supply_chain/suppliers",

pages/nongKe/cloud_entrepot/indexOther.vue

@@ -14,11 +14,11 @@
                 style="font-size: 31.54rpx;font-weight: 700;margin-left: 20rpx;color: #F84221;">
                 {{nav_title}}
               </view>
-              <!-- <view class=""
+              <view class=""
-                @click="navGoto(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"
+                @click="navGoto(`/pages/nongKe/supply_chain/supplierOther?tit=1&type_id=12&value=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"
                 style="font-size: 31.54rpx;font-weight: 700;margin-left: 22rpx;">
-                供货采购市场
+                线下支付商户
-              </view> -->
+              </view>
             </view>
           </view>
         </view>
@@ -227,7 +227,7 @@
     data() {
       return {
         domain: HTTP_REQUEST_URL,
-        nav_title: '供货采购商品',
+        nav_title: '线下支付商品',
         defaInd: [0, 0],
         columnData: [],
         showSerch: false,
@@ -328,7 +328,7 @@
     async onLoad(options) {
       // console.log(options);
       this.storeParam.sys_labels = options.value;
-      if(options.value==12)this.nav_title = '线下支付'
+      if(options.value==12)this.nav_title = '线下支付商品'
       this.tips = options.tips;
       let userInfo = this.$store.state.app.userInfo;
       if(typeof userInfo == 'string') this.userInfoData = JSON.parse(userInfo);

pages/nongKe/supply_chain/merchant.vue

@@ -32,7 +32,7 @@
         </view>
         <view class="right_goods_msg">
           <view class="num">
-            <text style="margin-right: 10rpx;">订货价:</text>
+            <text style="margin-right: 5rpx;">¥</text>
             <text>{{$procure_price(item)}}</text>
           </view>
           <!-- <view class="add_goods" @click="getGoodsDetails(item)">加入购物单</view> -->
@@ -41,10 +41,10 @@
     </block>
     <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" />
 
-    <navigator class="bottom_purchase" url="./shopping_trolley_a" open-type="navigate">采购清单<text v-if="goodsNum">{{goodsNum}}</text></navigator>
+    <navigator class="bottom_purchase" :url="source==12?'./shopping_trolley_other?source=12':'./shopping_trolley_a' " open-type="navigate">采购清单<text v-if="goodsNum">{{ ` (${goodsNum}) ` }}</text></navigator>
 
     <goodsPopup :goodsStatu="isPopupShow" @colses="isPopupShow=false" :goods_info="goodsInfo"></goodsPopup>
-    <shortPopup ref="shortPopupRef"></shortPopup>
+    <shortPopup ref="shortPopupRef" :source="source" @addCart="cartFn"></shortPopup>
     <u-popup :show="show" @close="close">
       <view>
         <h3 style=" margin: 15px 5px 5px 24px;">颜色规格</h3>
@@ -140,10 +140,12 @@
         }],
         goodsLite: {},
         goodsindexL: '',
-        goodsNum: 0
+        goodsNum: 0,
+        source: 11
       }
     },
     onLoad(e) {
+      this.source = e.value || 11;
       this.id = e.id
       this.initStore()
       this.getStoreGoodsList()
@@ -167,7 +169,7 @@
       cartFn() {
         getCartCounts({
           product_type: 98,
-          source: 11
+          source: this.source
         }).then(res => {
           this.goodsNum = res.data[0].count
         })