Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/components/plugin/modal.vue

@@ -134,9 +134,10 @@ export default {
 			})
 		},
 		handleClickCancel() {
-			if (!this.maskClosable) return
+			// if (!this.maskClosable)return;
 			// this.$emit('cancel')
-			this.$emit('click', {index: 0})
+			// this.$emit('click', {index: 0})
+			// if (!this.maskClosable)return;
 		}
 	}
 }

ghsApp/src/mixins/allMoreSelectInput.js

@@ -10,12 +10,21 @@ export default {
 	},
 
 	methods: {
+		// 计算重量
+		countWeight(){
+			let ratio = this.customData.ratio;
+			let smallCount = this.customData.smallCount;
+			let bigCount = this.customData.bigCount;
+			let weight = this.customData.weight;
+			this.customData.realityWeight = smallCount * weight / ratio + bigCount * weight
+		},
 		// 离开全选input
 		moveAllInput(e){
 			this.isActive=false;
 			this.isFocus=false;
 			if(e==''){return}
 			this.customData.bigCount = e;
+			this.countWeight();
 		},
 		//input点击删除按键
 		deleteInputVal(){
@@ -34,6 +43,7 @@ export default {
 			this.isFocusOne=false;
 			if(e==''){return}
 			this.customData.smallCount = e;
+			this.countWeight();
 		},
 		//input点击删除按键
 		deleteInputValOne(){

ghsApp/src/mixins/product.js

@@ -181,6 +181,7 @@ export default {
 						element.child.forEach(child => {
 							child.classId = element.classId;
 							child.className = element.className;
+							child.realityWeight = 0
 						});
 				});
 				this.productInfo = data;
@@ -517,6 +518,7 @@ export default {
 						...element,
 						bigCount: Number(item.bigCount),
 						smallCount: Number(item.smallCount),
+						realityWeight: Number(item.realityWeight),
 						itemPrice: item.itemPrice?Number(item.itemPrice):''
 					};
 

ghsApp/src/pagesPurchase/add.vue

@@ -92,7 +92,7 @@
 					<view class="select-cmd_bx">
 						<view class="num_bx">
 							<view class="kc">重量</view>
-							<allSelectInput :isActive="isWeightActive" :isFocus="isWeightFocus" :value="customData.weight" :placeholder="'公斤'"
+							<allSelectInput :isActive="isWeightActive" :isFocus="isWeightFocus" :value="customData.realityWeight" :placeholder="'公斤'"
 																							:width="416" :height="80" :fontSize="40"
 																							@deleteInputVal="deleteWeightInputVal" @initAllInput="initWeightAllInput" @moveAllInput="moveWeightAllInput">
 							</allSelectInput>
@@ -156,7 +156,8 @@ export default {
 				bigCount: 0,
 				smallCount: 0,
 				itemPrice: 0,
-				weight:0
+				weight:0,
+				realityWeight:0,
 			}
 		};
 	},
@@ -174,7 +175,7 @@ export default {
 			this.isWeightActive=false;
 			this.isWeightFocus=false;
 			if(e==''){return}
-			this.customData.weight = e;
+			this.customData.realityWeight = e;
 		},
 		//input点击删除按键
 		deleteAloneInputVal(){
@@ -184,7 +185,7 @@ export default {
 		//input重量点击删除按键
 		deleteWeightInputVal(){
 			this.isWeightActive=false;
-			this.customData.weight = '';
+			this.customData.realityWeight = '';
 		},
 		//自定义数量
 		customNum(info) {
@@ -213,6 +214,7 @@ export default {
 
 				if (val.index === 0) {
 					this.modalCancel();
+					this.delAllEvent(this.customData)
 				} else {
 					if(this.customData.itemPrice==0||this.customData.itemPrice==''){
 						uni.showToast({title:"请输入总价格",icon:"none"})

ghsApp/src/pagesPurchase/details.vue

@@ -213,6 +213,7 @@ export default {
 			let price = 0;
 
 			if (this.selectList) {
+				console.log(this.selectList,'selectList')
 				for (const item of this.selectList) {
 					if (item.itemPrice) {
 						price += Number(item.itemPrice);
@@ -312,7 +313,7 @@ export default {
 						bigNum: ele.bigCount,
 						smallNum: ele.smallCount,
 						itemId:ele.itemId,
-						weight:ele.weight,
+						weight:ele.realityWeight,
 						itemPrice: ele.itemPrice || this.getSelectItemPrice(ele)
 					};
 				});

hdApp/src/admin/home/order.vue

@@ -36,9 +36,9 @@
           </div>
           <div class="list-bottom">
             <div>
-              <span class="freight-text">运费：￥{{ item.sendCost }}</span>
+              <span v-if="item.sendCost > 0" class="freight-text">运费：￥{{ item.sendCost }}</span>
               <span>金额：</span>
-              <span class="app-size-30 app-bold">¥{{ item.actPrice }}</span>
+              <span class="app-size-30 app-bold">¥{{ item.realPrice }}</span>
             </div>
 
             <div class="list-button">

hdApp/src/admin/order/detail.vue

@@ -54,7 +54,7 @@
               <div v-if="data.reachDate == '0000-00-00'" class="value">-</div>
               <div v-else class="value"><span style="margin-right:10rpx;">{{data.reachDate}}</span> <span v-if="data.reachPeriod == 0">上午</span><span v-else-if="data.reachPeriod == 1">下午</span><span v-else>晚上</span></div>
             </div>
-            <div class="msg-list">
+            <div v-if="data.reachDate != '0000-00-00'" class="msg-list">
               <div class="label">贺卡</div>
               <div class="value">{{ data.needCard == 1 ? "需要" : '不需要' }}</div>
             </div>
@@ -90,9 +90,17 @@
               <div class="value">￥{{ data.sendCost }}</div>
             </div>
             <div class="msg-list">
-              <div class="label">总价</div>
+              <div class="label">总金额</div>
               <div class="value">￥{{ data.prePrice }}</div>
             </div>
+            <div v-if="data.discountAmount > 0" class="msg-list">
+              <div class="label">优惠</div>
+              <div class="value">￥{{ data.discountAmount }}</div>
+            </div>
+            <div class="msg-list">
+              <div class="label">实付款</div>
+              <div class="value">￥{{ data.realPrice }}</div>
+            </div>
           </div>
         </div>
       </div>
@@ -105,13 +113,11 @@
           <div
             class="app-color-3"
           >
-
           <template v-if="data.discountType == 0">未知</template>
           <template v-else-if="data.discountType == 1">优惠券</template>
           <template v-else-if="data.discountType == 2">会员优惠</template>
           <template v-else-if="data.discountType == 3">随机优惠</template>
           <template v-else>未知</template>
-
           </div>
           <div class="app-price">-￥{{ data.discountAmount }}</div>
         </div>