Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/components/parts/appliedPartsCell.vue

@@ -33,7 +33,7 @@
 				<text class="amount-view">{{total}}</text>
 				<text>件</text>
 			</view>
-			<u-button v-if="buttonText" :custom-style="customStyle" shape="circle" @click.stop="handleOperate" type="primary">{{buttonText}}</u-button>
+			<u-button v-if="showButton" :custom-style="customStyle" shape="circle" @click.stop="handleOperate" type="primary">{{buttonText}}</u-button>
 		</view>
 	</view>
 </template>
@@ -74,9 +74,13 @@
 					'20': '',
 					'-2': '',
 					'-1': '',
-					'100': ''
+					'100': '',
+					'91': ''
 				}
 			},
+			showButton() {
+				return this.info.status == '1' || this.info.status == '15'
+			},
 			isHorizontal() {
 				return this.type == 'horizontal'
 			},
@@ -88,7 +92,8 @@
 					'20': '',
 					'-2': '',
 					'-1': '',
-					'100': ''
+					'100': '',
+					'91': ''
 				}
 			},
 			buttonOperateType() {

src/pages/mine/warehouse/index.vue

@@ -168,7 +168,7 @@
 				this.$u.api.applyList(param).then((res) => {
 					if (res.code == 200) {
 						if (this.pageNumber == 1) {
-							this.partsList = []
+							this.partsList = []
 						}
 						let list = res.data || []
 						this.partsList.push(...list)

src/pages/mine/warehouse/partsDetail.vue

@@ -43,7 +43,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="bottom-view" v-if="buttonText">
+		<view class="bottom-view" v-if="showButton">
 			<view class="total-view">
 				<text>合计：</text>
 				<text class="amount-view">{{total}}</text>
@@ -84,11 +84,15 @@
 					'20': '',
 					'-2': '',
 					'-1': '',
-					'100': ''
+					'100': '',
+					'91': ''
 				}
 			},
 			buttonText() {
 				return this.texts[this.info.status]
+			},
+			showButton() {
+				return this.info.status == '1' || this.info.status == '15'
 			},
 			hasExpress() {
 				return this.$u.test.isEmpty(this.info.express) ? false : true

src/pages/order/complete.vue

@@ -65,21 +65,10 @@
                     v-show="item.fieldsName != 'actualPaid' || show200"
                     :id="`item${item.fieldsId}`"
                   >
-                    <view
-                      class="label"
-                      v-if="
-                        item.formType !== 'location' &&
-                        item.formType !== 'form' &&
-                        item.formType !== 'label'
-                      "
-                    >
-                      <image
-                        class="item-image"
-                        :src="mixingImage"
-                        v-if="item.required"
-                      ></image>
-                      {{ item.fieldsTitle }}
-                    </view>
+                  <view class="label" v-if="!hiddenTitle.includes(item.formType)">
+                      <image class="item-image" :src="mixingImage" v-if="item.required"></image>
+                      {{item.fieldsTitle}}
+                  </view>
                     <template v-if="item.fieldsType">
                       <xh-input
                         v-if="item.formType === 'input'"
@@ -687,6 +676,7 @@ export default {
                   if (!hasMate || !this.$u.test.isEmpty(mateRow)) {
                     panelResult.submitted++;
                   }
+				  panelResult.submitted++;
                 } else {
                   panelResult.submitted++;
                 }

src/pages/parts/addParts.vue

@@ -29,7 +29,7 @@
             class="u-flex"
             :scroll-into-view="scrollId"
           >
-            <view :id="`brand${item.brandId}`" :class="['label-title', { selected: item.brandId === brandId }]" v-for="(item, index) in brand" :key="index" @click="selectBrand(item, index)">{{ item.label }}</view>
+            <view :id="`brand${item.brandId}`" :class="['label-title', { selected: item.brandId == brandId }]" v-for="(item, index) in brand" :key="index" @click="selectBrand(item, index)">{{ item.label }}</view>
           </scroll-view>
         </view>
         <view class="more u-flex" @click="handleClick">
@@ -94,7 +94,7 @@ export default {
       categaryIndex: 0,
       categaryId: '',
       brandIndex: 0,
-      brandId: '',
+      brandId: 0,
       scrollId: '',
       loadStatus: "loadmore",
       lists: [],
@@ -188,7 +188,7 @@ export default {
             if (item && index) {
               this.selectBrand(item, index)
               this.scrollId = `brand${item.brandId}`
-            } else {
+            } else {
               this.brandId = this.brand[0].brandId
               this.lists = []
               this.getPartsList()

src/pages/parts/returnParts.vue

@@ -55,7 +55,7 @@
 				var pages = getCurrentPages();
 				if(pages.length >= 2) {
 					var prevPage = pages[pages.length - 2];  //上一个页面
-					const parts = prevPage.$vm._data.selectedParts
+					const parts = prevPage.$vm.selectedParts
 					if(this.$u.test.isEmpty(parts)) {
 						this.$u.route({type: 'back'})
 					}
@@ -67,7 +67,7 @@
 			},
 			validateForm() {
 				if(this.$u.test.isEmpty(this.parts)) {
-					this.$u.toast('物流公司不能为空')
+					this.$u.toast('备件不能为空')
 					return false
 				}
 				if(this.curWay == 0) {