Merge branch 'dev-1.5.0' into test

src/components/createCom/XhParts.vue

 <!-- *******************  物料选择  *******************  -->
 <template>
   <view>
-    <view class="list u-flex u-row-between">
-      <image class="item-image" :src="mixingImage" v-if="item.required"></image>
-      <view class="u-m-r-20">{{ item.fieldsTitle }}</view>
-      <view
-        class="u-flex-1 add-parts"
-        @click="toParts"
-        v-if="!disabled && lists.length > 0"
-      >
-        添加物料<u-icon name="arrow-right" color="#2979ff" size="30"></u-icon>
-      </view>
+    <view class="u-flex load" v-show="loading">
+      <u-loading mode="circle" class="loading"></u-loading>
     </view>
-    <view class="complete-part">
-      <view v-if="lists.length > 0">
-        <adjust-parts
-          v-for="(item, index) in lists"
-          :key="index"
-          :info="item"
-          @change="partsChange($event, index)"
-          @minusValue="minusValue($event, index)"
-          :disabled="disabled"
-        ></adjust-parts>
-      </view>
-      <view class="u-flex select-part" v-else>
-        <view class="img">
-          <image :src="noPartsImage" class="part-icon" />
+    <view v-show="!loading">
+      <view class="list u-flex u-row-between">
+        <!-- <image class="item-image" :src="mixingImage" v-if="item.required"></image>
+        <view class="u-m-r-20">{{ item.fieldsTitle }}</view> -->
+        <view
+          class="u-flex-1 add-parts"
+          @click="toParts"
+          v-if="!disabled && lists.length > 0"
+        >
+          添加物料<u-icon name="arrow-right" color="#2979ff" size="30"></u-icon>
         </view>
-        <view class="u-flex content">
-          <text class="title">暂无物料信息</text>
-          <text class="desc">可选择物料仓物料</text>
+      </view>
+      <view class="complete-part">
+        <view v-if="lists.length > 0">
+          <adjust-parts
+            v-for="(item, index) in lists"
+            :key="index"
+            :info="item"
+            @change="partsChange($event, index)"
+            @minusValue="minusValue($event, index)"
+            :disabled="disabled"
+          ></adjust-parts>
         </view>
-        <view class="btn">
-          <u-button shape="circle" :custom-style="customStyle" @click="toParts">
-            去选择
-          </u-button>
+        <view class="u-flex select-part" v-else>
+          <view class="img">
+            <image :src="noPartsImage" class="part-icon" />
+          </view>
+          <view class="u-flex content">
+            <text class="title">暂无物料信息</text>
+            <text class="desc">可选择物料仓物料</text>
+          </view>
+          <view class="btn">
+            <u-button shape="circle" :custom-style="customStyle" @click="toParts" :disabled="disabled">
+              去选择
+            </u-button>
+          </view>
         </view>
       </view>
     </view>
@@ -70,6 +75,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       lists: [],
     }
   },
@@ -103,6 +109,7 @@ export default {
           orderNumber: this.orderNumber
         })
         .then((res) => {
+          this.loading = false
           if (res.code === 200) {
             const data = res.data || []
             this.lists = lists.map(v => {
@@ -112,7 +119,6 @@ export default {
               }
               return v
             })
-            console.log("this.lists", this.lists)
           }
         })
     },
@@ -128,6 +134,7 @@ export default {
           success: (res) => {
             if (res.confirm) {
               this.lists.splice(index, 1)
+              this.valueChange(JSON.stringify(this.lists))
             } else if (res.cancel) {
               this.partsChange(1, index)
             }
@@ -160,6 +167,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.load {
+  width: 100%;
+  .loading {
+    margin:0 auto;
+  }
+}
 .item-image {
   width: 24rpx;
   height: 24rpx;

src/components/select-parts/index.vue

@@ -11,7 +11,7 @@
         <view class="right-content-name u-line-2">{{ info.name }}</view>
         <view class="right-content-desc u-line-2">{{ info.remark }}</view>
         <view class="u-flex right-content-opera">
-          <view class="no" v-if="info.max">
+          <view class="no" v-if="maxShow">
             可用{{ info.max }}件
           </view>
           <view class="num">
@@ -43,6 +43,12 @@
 				default () {
 					return false
 				}
+      },
+      maxShow: { // 是否显示可用数量
+        type: Boolean,
+				default () {
+					return true
+				}
       }
 		},
 		data() {

src/components/w-navbar/w-navbar.vue

@@ -8,6 +8,7 @@
 		:is-back="isBack"
 		:is-fixed="isFixed"
 		:title-bold="true"
+		:custom-back="customBack"
 		:border-bottom="false">
 	</u-navbar>
 </template>
@@ -61,6 +62,9 @@
 				type: Boolean,
 				default: true
 			},
+			customBack: {
+				type: Function
+			}
 		},
 		data() {
 			return {

src/pages/order/parts.vue

@@ -153,6 +153,7 @@ export default {
             skuId: v.skuId,
             quantity: v.quantity,
             cost: v.cost || 0,
+            max: v.max
           }
         })
 

src/pages/parts/addParts.vue

@@ -104,6 +104,7 @@
             :key="index"
             :info="item"
             :show-checked="false"
+            :maxShow="false"
             @numChange="numChange($event, item, index)"
             @apply="apply(item, index)"
           ></select-parts>
@@ -383,8 +384,9 @@ export default {
     },
     // 点击选择三级分类
     selectModel(item, index) {
-      this.scrollModelId = ''
+      this.scrollModelId = `model${item.id}`
       this.modelId = item.id
+      this.showMore = false
       this.lists = []
       this.pageNumber = 1
       this.getPartsList()

src/pages/parts/address.vue

 <template>
 	<view class="u-flex address-wrap">
-		<w-navbar title="收货地址"></w-navbar>
+		<w-navbar :customBack="customBack" title="收货地址"></w-navbar>
 		<view class="lists">
 			<view class="body" v-for="(item, index) in lists" :key="item.id">
 				<w-address @editSite="toEditSite(item)" @selectSite="selectSite(item)" @setDefault="setDefault(item, index)" @remove="remove(item)" :info="item" :is-default="item.enable === 1" :showRemove="true" />
@@ -47,6 +47,14 @@ export default {
 		this.getData();
 	},
 	methods: {
+		customBack() {
+			let pages = getCurrentPages();
+      let prevPage = pages[pages.length - 2]
+      prevPage.$vm.loadAddress()
+			this.$u.route({
+				type: 'back'
+			})
+		},
 		getData() {
 			this.getMineSite()
 		},