修改供应链商品

pageD/components/goodsInformation.vue

@@ -45,7 +45,7 @@
         </view>
         <view class="inventory" v-if="productAndCommodity">
           <text>库存：</text>
-          <text>222</text>
+          <text>{{ itemInfo.stock }}</text>
         </view>
         <view class="inventory" v-else>
           <text>{{ itemInfo.labels.join(" | ") }} </text>

pageD/newBulitOrder/component/nextLogistics.vue

@@ -108,6 +108,13 @@ export default {
       typeof: String,
       default: "",
     },
+    //多商品
+    goodsArr: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
   },
   computed: {
     i18n() {
@@ -146,6 +153,7 @@ export default {
               width: this.goodinfo.width, //		是	String	宽
               height: this.goodinfo.height, //		是	String	高
               cart_id: "",
+              goods_arr: JSON.stringify(this.goodsArr),
             },
           })
           .then((res) => {

pageD/newBulitOrder/newBulitOrder.vue

@@ -56,6 +56,7 @@
       :goodsValue="goodsValue"
       :specificationsPrice="specificationsPrice"
       @closeLogistics="closeLogistics"
+      :goodsArr="goodsArr"
     />
     <!-- 选择物流价格之后的下一步 -->
 
@@ -135,6 +136,7 @@ export default {
       goodsSource: "", //商品归属
       isDiscount: "", //商品是否存在打折
       specificationsPrice: 0, //订单商品总金额
+      goodsArr: [], //多商品用的商品规格
     };
   },
   computed: {
@@ -261,7 +263,6 @@ export default {
     getOrderGoods(id) {
       uni.$u.http.get(`/api/order/read?id=${id}`).then((res) => {
         this.goodsList = res;
-
         this.goodsValue = this.goodsList.goods[0].goods_num;
         this.goodsWeight = this.goodsList.weight_total;
         this.goodsList.goods.map((item) => {
@@ -269,6 +270,13 @@ export default {
           this.sku_item_id = item.sku_item_id;
           this.merchant_goods_id = item.merchant_goods_id;
           // this.goodsSource = item.goods.source;
+          //多商品获取规格商品id
+          let obj = {
+            merchant_goods_id: item.merchant_goods_id,
+            goods_num: item.goods_num,
+            sku_item_id: item.sku_item_id,
+          };
+          this.goodsArr.push(obj);
           //获取订单商品总金额
           this.specificationsPrice +=
             Number(item.discount_price) * item.goods_num;

pageD/productDetails/productDetails.vue

@@ -153,7 +153,20 @@ export default {
   },
   computed: {
     downOrGrounding() {
+      //判断供应链商品是否存在审核失败
+      if (
+        this.pageStatus == "supply" &&
+        this.commodityDetail.review_status == "2"
+      ) {
+        return false;
+      }
       if (this.commodityDetail.status == "down") {
+        if (
+          this.pageStatus == "supply" &&
+          this.commodityDetail.review_status == "2"
+        ) {
+          return false;
+        }
         return false;
       } else {
         if (this.commodityDetail.merchant_goods == "down") {

unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>

unpackage/dist/dev/mp-weixin/pageB/search.wxml

@@ -1 +1 @@
-<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex  data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>
+<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>

unpackage/dist/dev/mp-weixin/pageD/components/agreePopup.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup",
     "u--input": "/uview-ui/components/u--input/u--input"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/commodity.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pageD/orderDetail/component/commodityDetail.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }