小程序供货商发货添加备注字段、零售端开单优化

ghsApp/src/admin/billing/affirm.vue

@@ -148,16 +148,8 @@
         }}</text>
         <text class="price-number">
           ¥
-          <text
-            class="large"
-            v-if="form.sendType == 1"
-          >{{
-            allPrice + Number(form.sendCost)
-          }}</text>
-          <text
-            class="large"
-            v-else
-          >{{ allPrice }}</text>
+          <text class="large" v-if="form.sendType == 1">{{	(allPrice + Number(form.sendCost)).toFixed(2) }}</text>
+          <text class="large" v-else >{{ allPrice.toFixed(2) }}</text>
         </text>
       </view>
       <button

ghsApp/src/components/app-form-send1.vue

@@ -22,6 +22,11 @@
 			<view v-else class="tui-placeholder"></view>
 			<input name="sendCost" hidden />
 		</tui-list-cell>
+		<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+			<view class="tui-title">备注</view>
+			<textarea placeholder="请输入备注" v-model="formData.remark" style="height: 200rpx;border: 1px solid #eee;"></textarea>
+			<input name="sendCost" hidden />
+		</tui-list-cell>
 	</view>
 </template>
 
@@ -63,7 +68,8 @@ export default {
 				sendSide: "",
 				sendType: "3", //1自取 2本店送 3快递送
 				sendDate: "",
-				sendTime: ""
+				sendTime: "",
+				remark: "",
 			},
 			userLong:'',
 			userLat:'',

ghsApp/src/pagesOrder/shipInfo.vue

@@ -48,7 +48,8 @@ export default {
 				sendTime: "",
 				sendCost: "",
 				customId: "",
-				product: ""
+				product: "",
+				remark: "",
 			},
 			showCustomer: false
 		};
@@ -87,7 +88,7 @@ export default {
 		},
 		confirmFn(options) {
 			console.log(options)
-			sendExpressage({ id: this.orderId,sendCost:options.sendCost,expressId:options.sendSide,sendTime:options.sendTime }).then(res => {
+			sendExpressage({ id: this.orderId,sendCost:options.sendCost,expressId:options.sendSide,sendTime:options.sendTime,remark:options.remark }).then(res => {
 				uni.navigateBack({delta: 1});
 			})
 		},

hdApp/src/components/module/app-goods-commodity.vue

@@ -1,22 +1,24 @@
 <!--姜枫 2021.04.11-->
 <template>
-	<view class="item-cmd_bx" @click="addEvents">
-		<view class="img_bx" @click="addEvents">
-			<app-img  :src="info.smallImgList[0]" alt="商品图" mode="aspectFit" :height="160" />
-		</view>
-		<view class="cmd-info_bx">
-			<view class="tit" @click="addEvents">{{ info.goodsName || "" }}</view>
-<!--			<view class="kc" @click="addEvents">库存 {{ info.stock }}</view>-->
-			<view class="num-open_bx">
-<!--				<view class="price">￥{{ showPrice }}</view>-->
-				<view class="price">￥{{ info.price }}</view>
-				<view class="open-bx" >
-					<i class="iconfont iconjianqu" :class="delAnimationData?'animation':''" @click.stop="delEvent" v-if="bigCount > 0"></i>
-					<text class="num" >
-						<text v-if="bigCount > 0">{{ bigCount }}</text>
-					</text>
-					<i class="iconfont icontianjia" v-if="info.goodsStyle>0" :class="addAnimationData?'animation':''" @click="isGoodsStyle = true"></i>
-					<i class="iconfont icontianjia" v-else :class="addAnimationData?'animation':''" @click.stop="addEvents"></i>
+	<view>
+		<view class="item-cmd_bx" @click="addEvents">
+			<view class="img_bx" >
+				<app-img  :src="info.smallImgList[0]" alt="商品图" mode="aspectFit" :height="160" />
+			</view>
+			<view class="cmd-info_bx">
+				<view class="tit" @click="addEvents">{{ info.goodsName || "" }}</view>
+	<!--			<view class="kc" @click="addEvents">库存 {{ info.stock }}</view>-->
+				<view class="num-open_bx">
+					<!--<view class="price">￥{{ showPrice }}</view>-->
+					<view class="price">￥{{ info.price }}</view>
+					<view class="open-bx" >
+						<i class="iconfont iconjianqu" :class="delAnimationData?'animation':''" @click.stop="delEvent" v-if="bigCount > 0"></i>
+						<text class="num" >
+							<text v-if="bigCount > 0">{{ bigCount }}</text>
+						</text>
+						<i class="iconfont icontianjia" v-if="info.goodsStyle>0" @click.stop="showGoodsStyle"></i>
+						<i class="iconfont icontianjia" v-else :class="addAnimationData?'animation':''" @click.stop="addEvents"></i>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -69,12 +71,16 @@ export default {
 	},
 	created() {},
 	mounted() {
-		if(this.info.priceLabel == 2){
-			this.changeAutoPrice = this.info.price
-		}
-		this.showPrice = this.info.price
+		// console.log(this.info,'this.info')
+		// if(this.info.priceLabel == 2){
+		// 	this.changeAutoPrice = this.info.price
+		// }
+		// this.showPrice = this.info.price
 	},
 	methods: {
+		showGoodsStyle(){
+			this.isGoodsStyle = true;
+		},
 		ok(bigCount,index){
 			let params = {
 				...this.info,
@@ -82,7 +88,7 @@ export default {
 				bigCount: bigCount
 			};
 			this.$emit("addGoodsEvent",params);
-			console.log(params);
+			console.log(params,'console.log(this.bigCountNum)');
 			this.isGoodsStyle = false;
 		},
 		addEvents() {