更新功能

api/behalfAdmin.js

@@ -25,3 +25,11 @@ export function behalfAdminNumber(data) {
   return request.get("behalf_admin/number", data);
 }
 
+/**
+ * 生成二维码
+ * 
+ */
+export function behalfAdminCode(data) {
+  return request.get("behalf_admin/code", data);
+}
+

pages/nongKe/supply_chain/merchant.vue

@@ -18,7 +18,7 @@
     </view>
 
     <block v-for="(item,index) in list" :key="index">
-      <view class="item_list flex">
+      <view class="item_list flex" @click="navToGoodsDetails(item)">
         <view>
           <image class="goods_image" :src="item.image" mode="aspectFit"></image>
         </view>
@@ -35,7 +35,7 @@
             <text>订货价:</text>
             <text>{{' '+item.price}}</text>
           </view>
-          <view class="add_goods" @click="getGoodsDetails(item)">加入购物单</view>
+          <!-- <view class="add_goods" @click="getGoodsDetails(item)">加入购物单</view> -->
         </view>
       </view>
     </block>
@@ -242,6 +242,15 @@
         }
 
       },
+      /**
+       * 跳转到产品详情
+       */
+      navToGoodsDetails(item){
+        console.log(item);
+        uni.navigateTo({
+          url: `pages/goods_details/index?id=${item.product_id}&referer=`
+        })
+      },
       /*
        * 加入购物车
        */

pages/product/addGoods/index.vue

@@ -91,7 +91,6 @@
         </view>
       </view>
 
-      <priceComponent :product_id="product_id" :bar_code="code" @updateCode = "updateCode" v-if="showCommodity"></priceComponent>
       
       <!-- <view class="popup_group">
       	<view class="radio">
@@ -143,6 +142,8 @@
       	</view>
       </view> -->
       
+      <priceComponent :product_id="product_id" :bar_code="code" @updateCode = "updateCode" v-if="showCommodity"></priceComponent>
+
       <view class="popup_group">
 
         <!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
@@ -606,7 +607,7 @@
             this
             .setFormData.slider_image
           ];
-          this.setFormData.cate_name = editGoodsDetils.storeCategory.cate_name; // 平台分类回显
+          this.setFormData.cate_name = editGoodsDetils?.storeCategory?.cate_name; // 平台分类回显
           this.setFormData.mer_cate_name = editGoodsDetils.merCateId ? editGoodsDetils.merCateId.map(
             item => item
             .category && item.category.cate_name).join(',') : '';

pages/replace_replenishment/replace.vue

@@ -264,7 +264,7 @@
 									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
 										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
                   <block v-if="item.order_status==2">
-                  	<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>去发货</view>
+                  	<view class='bnt b-color' @click='consignment(item.order_id)'>去发货</view>
                   </block>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
@@ -362,6 +362,15 @@
 					<view class="cle" @click="close">取消</view>
 				</view>
 			</u-popup>
+      <u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpShow = false">
+        <view style="text-align: center;margin-top: 30rpx;">
+          请把二维码展示给取货人员
+        </view>
+        <view style="padding: 28.07rpx;">
+          <image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
+      
+        </view>
+      </u-popup>
 		</view>
 	</template>
 
@@ -389,7 +398,8 @@
 		} from '@/api/order.js';
     import{
       behalfAdminOrderList,
-      behalfAdminNumber
+      behalfAdminNumber,
+      behalfAdminCode
     } from "@/api/behalfAdmin.js"
 		import {
 			getUserInfo
@@ -411,6 +421,7 @@
 		import {
 			HTTP_REQUEST_URL
 		} from '@/config/app';
+import { Toast } from '../../libs/uniApi';
 		export default {
 			components: {
 				payment,
@@ -424,6 +435,8 @@
 					loading: false, //是否加载中
 					loadend: false, //是否加载完毕
 					loadTitle: '加载更多', //提示语
+          popUpShow: false, //二维码弹窗
+          payCodeUrl: '', //二维码地址
 					orderList: [], //订单数组
 					presellProList: [], //定金预售订单
 					presellOrderCount: 0,
@@ -693,6 +706,19 @@
 					}
 					// #endif
 				},
+        /**
+         * 去发货
+         */
+        consignment: function(order_id) {
+          this.popUpShow = true;
+          behalfAdminCode({
+            order_id
+          }).then((res)=>{
+            this.payCodeUrl = res.data.qrcode;
+          }).catch((e)=>{
+            Toast(e)
+          })
+        },
 				/**
 				 * 提示
 				 */