合并

components/kj-chat/kj-chat.vue

@@ -93,7 +93,6 @@
 	} from '@/utils/WebIM';
 	import WebIM from '@/newSDK/Easemob-chat-4.1.7.js'
 	import emoji from "@/commont/emoji.js"
-
 	const recorderManager = uni.getRecorderManager()
 	var init // 录制时长计时器
 
@@ -138,6 +137,7 @@
 
 		methods: {
 			longpressBtn() {
+				console.log('长按说话');
 				this.longPress = '2';
 				// this.countdown(60); // 倒计时
 				// clearInterval(init) // 清除定时器
@@ -162,10 +162,9 @@
 			},
 			// 长按松开录音事件
 			touchendBtn() {
+				console.log('长按松开录音事件');
 				let _this = this
 				this.longPress = '1';
-				console.log('aaaaaaaaaaa');
-				console.log(recorderManager);
 				recorderManager.onStop((res) => {
 					console.log(res);
 					_this.tempFilePath = res.tempFilePath
@@ -175,6 +174,7 @@
 						filePath: _this.tempFilePath,
 						name: 'file',
 						success: (res) => {
+							console.log('发送语音',res);
 							uni.hideLoading()
 							if (JSON.parse(res.data).code == 1) {
 								_this.sendluyin(JSON.parse(res.data).data.fullurl);

components/kj-tabbar/kj-tabbar.vue

@@ -89,6 +89,8 @@
 				language: "zh-CN",
 				selegoods: [],
 				stringcheck: [],
+				skuitemid: [],
+				volume: ''
 			};
 		},
 		onLoad() {},
@@ -137,6 +139,7 @@
 			},
 		},
 		created() {
+			this.all = []
 			if (uni.getStorageSync("language") != "") {
 				this.language = uni.getStorageSync("language");
 			}
@@ -153,6 +156,7 @@
 					console.log(this.checkboxValue1);
 					console.log(this.goodsList);
 					this.selegoods = [];
+					this.skuitemid = []
 					this.goodsList.map((item) => {
 						item.goods.map((items) => {
 							console.log('indexOf', this.checkboxValue1.indexOf(items.cart.id));
@@ -161,10 +165,19 @@
 								console.log(items);
 								this.selegoods = this.selegoods.concat(items);
 								this.stringcheck = this.stringcheck.concat(items.cart.id);
+								this.skuitemid = this.skuitemid.concat(items.cart.sku_item_id);
 								console.log('333333333', this.selegoods);
 							}
 						});
 					});
+					uni.$u.http
+						.get(`/api/order_goods_volume?sku_item_id=` + this.skuitemid.toString(), {
+
+						})
+						.then((res) => {
+							console.log('weight', res);
+							this.volume = res
+						});
 					this.$nextTick(() => {
 						uni.navigateTo({
 							url: "/pageA/order?selelist=" +
@@ -176,7 +189,7 @@
 								"&goodsWeight=" +
 								this.goodsWeight +
 								"&stringcheck=" +
-								this.stringcheck.toString(),
+								this.stringcheck.toString() + '&volume=' + this.volume
 						});
 					});
 				}

pageA/chat/chat.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="chat-pages">
-		<u-navbar :border="false">
+		<u-navbar :border="false" :fixed='true' :placeholder='true'>
 			<view class="u-nav-slot" slot="left" style="display: flex;">
 				<u-icon name="arrow-left" @click="return1()" size="20"></u-icon>
 				<image src="@/static/images/index/dianhua.png" mode=""
@@ -36,44 +36,17 @@
 				</view>
 				<image :src="item.msg ? item.msg : item.url" v-if="item.type === 'img'" mode="widthFix"
 					style="width: 200px;text-align: right;" @click="previewimg(item.url)"></image>
-				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'cand'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
-					<view class="header-top u-flex u-row-between">
-						<view class="header-left">
-							<view class="u-flex">
-								<text class="text1">{{item.ext.order.name}}</text>
-							</view>
+				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
+					<view class="u-flex ">
+						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
+						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+							<view class="chattitle">{{item.ext.order.name}}</view>
+							<text class="catmoney">￥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
 						</view>
-						<view class="header-right">
-							<image :src="item.ext.order.avatar" class="right-img" mode=""></image>
-							<image src="../static/images/nan.png" class="sex" mode=""
-								v-if="item.ext.order.sex == 'male'"></image>
-							<image src="../static/images/nv.png" class="sex" mode="" v-else></image>
-						</view>
-					</view>
-					<view class="goutong-time">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
-				</view>
-				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'pos'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
-					<view class="header1-top u-flex u-row-between">
-						<text>{{item.ext.order.title}}</text>
-						<text>{{item.ext.order.salary}}K</text>
-					</view>
-					<view class="goutong-time1">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
-				</view>
-				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'order'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'order')">
-					<view class="header1-top u-flex u-row-between">
-						<text>{{item.ext.order.title}}</text>
-						<text>{{item.ext.order.salary}}K</text>
-					</view>
-					<view class="goutong-time1">
-						{{renderTime(item.time)}} 发起沟通
 					</view>
+					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+					<view class="chatfu">{{item.ext.order.fu}}</view>
 				</view>
 			</view>
 			<view class="chat-item-box u-flex u-col-top jend" v-if="item.from == user_no">
@@ -91,44 +64,17 @@
 				</view>
 				<image :src="item.msg ? item.msg : item.url" v-if="item.type === 'img'" mode="widthFix"
 					style="width: 200px;text-align: right;" @click="previewimg(item.url)"></image>
-				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'cand'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
-					<view class="header-top u-flex u-row-between">
-						<view class="header-left">
-							<view class="u-flex">
-								<text class="text1">{{item.ext.order.name}}</text>
-							</view>
+				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
+					<view class="u-flex ">
+						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
+						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+							<view class="chattitle">{{item.ext.order.name}}</view>
+							<text class="catmoney">￥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
 						</view>
-						<view class="header-right">
-							<image :src="item.ext.order.avatar" class="right-img" mode=""></image>
-							<image src="../static/images/nan.png" class="sex" mode=""
-								v-if="item.ext.order.sex == 'male'"></image>
-							<image src="../static/images/nv.png" class="sex" mode="" v-else></image>
-						</view>
-					</view>
-					<view class="goutong-time">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
-				</view>
-				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'pos'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
-					<view class="header1-top u-flex u-row-between">
-						<text>{{item.ext.order.title}}</text>
-						<text>{{item.ext.order.salary}}K</text>
-					</view>
-					<view class="goutong-time1">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
-				</view>
-				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'order'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'order')">
-					<view class="header1-top u-flex u-row-between">
-						<text>{{item.ext.order.title}}</text>
-						<text>{{item.ext.order.salary}}K</text>
-					</view>
-					<view class="goutong-time1">
-						{{renderTime(item.time)}} 发起沟通
 					</view>
+					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+					<view class="chatfu">{{item.ext.order.fu}}</view>
 				</view>
 				<image v-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 			</view>
@@ -167,7 +113,7 @@
 		},
 		onLoad(options) {
 			this.user = uni.getStorageSync('user_info')
-			console.log('user',this.user);
+			console.log('user', this.user);
 			if (options.user_other) {
 				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
 			}
@@ -329,6 +275,46 @@
 </script>
 
 <style lang="scss">
+	.chatfu{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #555555;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
+	.chattitle {
+		width: 314rpx;
+		height: 72rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		-webkit-line-clamp: 2;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		// white-space: pre-wrap;
+		
+	}
+	.catmoney{
+		width: 104rpx;
+		height: 46rpx;
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 26rpx;
+		color: #F83224;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		font-weight: 600;
+	}
+
 	.title {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;
@@ -460,14 +446,15 @@
 		}
 
 		.chat-header {
-			width: 702rpx;
+			width: 540rpx;
+			// height: 264rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;
 			position: sticky;
 			left: 24rpx;
-			z-index: 20;
+			z-index: 10;
 			margin: 10px auto;
-			padding: 0 20rpx;
+			padding:  20rpx;
 
 			.goutong-time {
 				line-height: 80rpx;

pageA/chat/news.vue

@@ -6,41 +6,20 @@
 			<input type="text" placeholder="搜索聊天记录/团长" style="width: 600rpx;margin-left: 16rpx;" />
 		</view>
 		<!-- 客服 -->
-		<view v-if="user_no !='13523652365'" class="kefu u-flex" @click="tokefu">
-			<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
-			<view class="u-row-between"
-				style="height: 88rpx;display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">
-				<view class="u-flex u-row-between">
-					<view class="name">官方客服</view>
-					<view class="time">14:09</view>
-				</view>
-				<view class="u-flex u-row-between">
-					<text class="news">[卡片]</text>
-					<u-badge :type="type" max="99" :value="value"></u-badge>
-				</view>
-			</view>
-		</view>
-		<view class="box ">
-			<view class="u-flex " style="margin-bottom: 26rpx;" v-for="(item,idx) in  list" :key="idx"
-				@click="chat(item.lastMessage)">
-				<image :src="item.lastMessage.ext.user_other.avatar" style="width: 88rpx;height: 88rpx;" mode="">
-				</image>
-				<view class="u-row-between" style="display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">
+		<view class="" v-for="(item,idx) in list" :key="idx">
+			<view v-if="user_no !='13523652365' && item.lastMessage.to == '13523652365'" class="kefu u-flex"
+				@click="tokefu">
+				<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
+				<view class="u-row-between"
+					style="height: 88rpx;display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">
 					<view class="u-flex u-row-between">
-						<view class="name" v-if="item.lastMessage.to == user_no">
-							{{item.lastMessage.ext.user_other.nickname}}
-						</view>
-						<view class="name" v-else>
-							{{item.lastMessage.ext.user_other.merchant_name || item.lastMessage.ext.user.nickname}}
-						</view>	
-						<!-- <view class="name">{{item.lastMessage.ext.user}}</view> -->
+						<view class="name">官方客服</view>
 						<view class="time">
 							{{new Date(item.lastMessage.time).getFullYear()}}-{{new Date(item.lastMessage.time).getMonth() + 1}}-{{new Date(item.lastMessage.time).getDate()}}
 							{{new Date(item.lastMessage.time).toTimeString().substr(0, 8)}}
 						</view>
 					</view>
-					<view class="u-flex u-row-between"
-						style="border-bottom: 2rpx solid #979797;padding-bottom: 26rpx;margin-top: 10rpx;">
+					<view class="u-flex u-row-between">
 						<text v-if="item.lastMessage.msg" class="news">{{item.lastMessage.msg}}</text>
 						<text v-if="item.lastMessage.type == 'img'" class="news">图片</text>
 						<u-badge :type="type" max="99" :value="item.unReadCount"></u-badge>
@@ -48,6 +27,37 @@
 				</view>
 			</view>
 		</view>
+		<view class="box ">
+			<view style="margin-bottom: 26rpx;" v-for="(item,idx) in  list" :key="idx" @click="chat(item.lastMessage)">
+				<view class="u-flex " v-if="user_no == '13523652365'? item.lastMessage.to == '13523652365' :
+					item.lastMessage.to !='13523652365'">
+					<image :src=" item.lastMessage.ext.user_other.avatar" style="width: 88rpx;height: 88rpx;" mode="">
+					</image>
+					<view class="u-row-between"
+						style="display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">
+						<view class="u-flex u-row-between">
+							<view class="name" v-if="item.lastMessage.from == user_no">
+								{{ item.lastMessage.ext.user_other.merchant_name ||item.lastMessage.ext.user_other.nickname}}
+							</view>
+							<view class="name" v-else>
+								{{ item.lastMessage.ext.user.nickname}}
+							</view>
+							<!-- <view class="name">{{item.lastMessage.ext.user}}</view> -->
+							<view class="time">
+								{{new Date(item.lastMessage.time).getFullYear()}}-{{new Date(item.lastMessage.time).getMonth() + 1}}-{{new Date(item.lastMessage.time).getDate()}}
+								{{new Date(item.lastMessage.time).toTimeString().substr(0, 8)}}
+							</view>
+						</view>
+						<view class="u-flex u-row-between"
+							style="border-bottom: 2rpx solid #979797;padding-bottom: 26rpx;margin-top: 10rpx;">
+							<text v-if="item.lastMessage.msg" class="news">{{item.lastMessage.msg}}</text>
+							<text v-if="item.lastMessage.type == 'img'" class="news">图片</text>
+							<u-badge :type="type" max="99" :value="item.unReadCount"></u-badge>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 

pageA/order.vue

@@ -302,7 +302,7 @@
 				this.value = options.value
 				this.sku_info = JSON.parse(decodeURIComponent(options.sku));
 				this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo))
-				if(options.share_merchant_id){
+				if (options.share_merchant_id) {
 					this.share_merchant_id = options.share_merchant_id
 				}
 				console.log(this.goodinfo);
@@ -392,7 +392,7 @@
 						transport_type_id: this.transport_type_id,
 						weight: this.typea == 'shop' ?
 							this.goodsWeight : Number(this.sku_info.weight) * this.value,
-						type: this.goodinfo.cate == 0 ? 'normal' : 'special',
+						type: this.typea == 'shop' ? '' : this.goodinfo.cate == 0 ? 'normal' : 'special',
 						length: Number(this.goodinfo.length) * this.value, //		是	String	长
 						width: this.goodinfo.width, //		是	String	宽
 						height: this.goodinfo.height, //		是	String	高
@@ -550,7 +550,7 @@
 					share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
 					belong: this.goodinfo.source || '' //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
 				}).then((res) => {
-					console.log('share_merchant_id',this.share_merchant_id);
+					console.log('share_merchant_id', this.share_merchant_id);
 					console.log(res);
 					uni.navigateTo({
 						// url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id

pageA/productdetails.vue

@@ -45,15 +45,10 @@
               i18n.Discounted
             }}</text>
 						<text class="money">¥</text>
-						<text class="money" style="font-size: 48rpx">{{
-              goodinfo.is_discount == 0
-                ? goodinfo.discount_price.slice(0, -3)
-                : goodinfo.price.slice(0, -3)
+						<text class="money" style="font-size: 48rpx">{{ goodinfo.discount_price.slice(0, -3)
             }}</text>
 						<text class="money">{{
-              goodinfo.is_discount == 0
-                ? goodinfo.discount_price.slice(-3)
-                : goodinfo.price.slice(-3)
+							 goodinfo.discount_price.slice(-3)
             }}</text>
 						<text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price }}</text>
 					</view>
@@ -292,8 +287,7 @@
 					<view class="" style="margin-left: 20rpx">
 						<view class="">
 							<text class="read">¥</text>
-							<text class="read" style="font-size: 40rpx;font-weight: 600;"
-								v-if="goodinfo.is_discount == 0">{{
+							<text class="read" style="font-size: 40rpx;font-weight: 600;">{{
                   (Number(sku_info.discount_price * 100) *
                     Number(value * 100)) /
                     10000 ||
@@ -302,12 +296,12 @@
                     10000
                 }}</text>
 							<!-- <text class="read" v-if="goodinfo.is_discount==0">{{(goodinfo.discount_price * value).slice(-3)}}</text> -->
-							<text class="read" style="font-size: 40rpx;font-weight: 600;"
+							<!-- 							<text class="read" style="font-size: 40rpx;font-weight: 600;"
 								v-if="goodinfo.is_discount == 1">{{
                   (Number(sku_info.price * 100) * Number(value * 100)) /
                     10000 ||
                   (Number(goodinfo.price * 100) * Number(value * 100)) / 10000
-                }}</text>
+                }}</text> -->
 							<!-- <text class="read" v-if="goodinfo.is_discount==1">{{(goodinfo.price * value).slice(-3)}}</text> -->
 							<!-- <text class="read" style="font-size: 40rpx;" >{{(Number(goodinfo.price) * Number(value)).toString()}}</text> -->
 						</view>
@@ -440,6 +434,10 @@
 </template>
 
 <script>
+	import WebIM from '@/newSDK/Easemob-chat-4.1.7.js'
+	import {
+		conn
+	} from '@/utils/WebIM';
 	export default {
 		data() {
 			return {
@@ -551,7 +549,9 @@
 				content: {},
 				bao: '',
 				picture2: '',
-				userid: ''
+				userid: '',
+				fu: '',
+				name_c: ''
 			};
 		},
 		computed: {
@@ -682,11 +682,36 @@
 				uni.navigateBack()
 			},
 			chat() {
-				uni.navigateTo({
-					url: '/pageA/chat/chat?user_other=' + encodeURIComponent(JSON.stringify(this.goodinfo
-							.merchant)) + '&user_other_no=' + this.goodinfo.merchant.member
-						.easemob_username
-				})
+				let that = this
+				let id = conn.getUniqueId(); // 生成本地消息id
+				let msg = new WebIM.message('txt', id); // 创建文本消息
+				msg.set({
+					type: "txt",
+					msg: "商品信息",
+					to: this.goodinfo.merchant.member.easemob_username,
+					chatType: "singleChat",
+					ext: {
+						"type": "shopinfo",
+						"order": {
+							"name": that.name_c,
+							'image': that.goodinfo.image,
+							'discount_price': that.goodinfo.discount_price,
+							'fu': that.fu
+						}
+					},
+					success: function(id, serverMsgId) {
+						uni.navigateTo({
+							url: '/pageA/chat/chat?user_other=' + encodeURIComponent(JSON.stringify(
+									that.goodinfo
+									.merchant)) + '&user_other_no=' + that.goodinfo.merchant.member
+								.easemob_username
+						})
+					},
+					fail: function(e) {
+						console.log("发送消息失败");
+					}
+				});
+				conn.send(msg.body);
 			},
 			sharea() {
 				this.share = true
@@ -806,14 +831,21 @@
 					.then((res) => {
 						console.log(res);
 						this.goodinfo = res;
-						this.goodinfoname = this.goodinfo.name_cn
-						this.goodinfoyuan = this.goodinfo.is_discount == 0 ?
-							this.goodinfo.discount_price :
-							this.goodinfo.price
-
-
+						if (this.language == 'en-US') {
+							this.name_c = this.goodinfo.name_en
+						}
+						if (this.language == 'es-ES') {
+							this.name_c = this.goodinfo.name_es
+						}
+						if (this.language == 'it-IT') {
+							this.name_c = this.goodinfo.name_ita
+						}
 
-						console.log('goodinfo.discount_price', this.goodinfo.discount_price);
+						if (this.language == 'zh-CN') {
+							this.name_c = this.goodinfo.name_cn
+						}
+						this.goodinfoname = this.goodinfo.name_cn
+						this.goodinfoyuan = this.goodinfo.discount_price
 						this.comment();
 						this.rate = res.merchant.score;
 					})
@@ -826,6 +858,19 @@
 					.then((res) => {
 						console.log(res);
 						this.content = res
+						if (this.language == 'en-US') {
+							this.fu = this.content.name_en
+						}
+						if (this.language == 'es-ES') {
+							this.fu = this.content.name_es
+						}
+						if (this.language == 'it-IT') {
+							this.fu = this.content.name_ita
+						}
+						
+						if (this.language == 'zh-CN') {
+							this.fu = this.content.name_cn
+						}
 					})
 					.catch(() => {});
 			},

pages/index/index.vue

@@ -168,7 +168,7 @@
 					</view>
 					<view class="">
 						<text class="money">
-							¥{{item.is_discount==0?item.discount_price:item.price}}
+							¥{{item.discount_price}}
 						</text>
 						<text class="weight">
 							¥{{item.weight}}/kg

unpackage/dist/build/mp-weixin/pageD/commodityManage/commodityManage.wxss

@@ -1 +1 @@
-.top-tab-search.data-v-8a9c30be{background-color:#fff;padding:10rpx 24rpx;z-index:20174}.top-tab-search .search.data-v-8a9c30be{display:flex;align-items:center}.top-tab-search .search .screen.data-v-8a9c30be{display:flex;align-items:center;font-size:26rpx;color:#333;margin-left:20rpx}.top-tab-search .search .screen .screen-icon.data-v-8a9c30be{width:24rpx;height:24rpx;margin-left:5rpx}.top-tab-search .top-tab.data-v-8a9c30be{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-8a9c30be{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-8a9c30be{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-8a9c30be::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-8a9c30be{padding:20rpx 24rpx;background-color:#fff;margin-bottom:150rpx}.page .list.data-v-8a9c30be{display:flex;flex-wrap:nowrap;align-items:center}.page .list .radio.data-v-8a9c30be{margin-right:20rpx}.footer.data-v-8a9c30be{position:fixed;display:flex;align-items:center;justify-content:space-between;bottom:0;background-color:#fff;width:93%;padding:16rpx 24rpx 70rpx 24rpx}.footer .batch.data-v-8a9c30be{color:#333;font-size:28rpx;margin-right:50rpx;display:flex;align-items:center}.footer .btn-1.data-v-8a9c30be{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#fff;color:#f83224;border:2rpx solid #f83224;padding:0;margin:0;font-size:30rpx}.footer .btn.data-v-8a9c30be{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;font-size:30rpx}
+.top-tab-search.data-v-43683496{background-color:#fff;padding:10rpx 24rpx;z-index:20174}.top-tab-search .search.data-v-43683496{display:flex;align-items:center}.top-tab-search .search .screen.data-v-43683496{display:flex;align-items:center;font-size:26rpx;color:#333;margin-left:20rpx}.top-tab-search .search .screen .screen-icon.data-v-43683496{width:24rpx;height:24rpx;margin-left:5rpx}.top-tab-search .top-tab.data-v-43683496{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-43683496{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-43683496{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-43683496::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-43683496{padding:20rpx 24rpx;background-color:#fff;margin-bottom:150rpx}.page .list.data-v-43683496{display:flex;flex-wrap:nowrap;align-items:center}.page .list .radio.data-v-43683496{margin-right:20rpx}.footer.data-v-43683496{position:fixed;display:flex;align-items:center;justify-content:space-between;bottom:0;background-color:#fff;width:93%;padding:16rpx 24rpx 70rpx 24rpx}.footer .batch.data-v-43683496{color:#333;font-size:28rpx;margin-right:50rpx;display:flex;align-items:center}.footer .btn-1.data-v-43683496{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#fff;color:#f83224;border:2rpx solid #f83224;padding:0;margin:0;font-size:30rpx}.footer .btn.data-v-43683496{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;font-size:30rpx}

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/discountsPopup"],{"0085":function(e,n,t){"use strict";t.r(n);var o=t("20a80"),i=t.n(o);for(var u in o)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(u);n["default"]=i.a},"0b33":function(e,n,t){},"20a80":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{show:{typeof:Boolean,default:!1},selectGoodsInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{value:"",discountPrice:0,preferential:0}},methods:{close:function(){this.value="",this.discountPrice=0,this.preferential=0,this.$emit("close")},confirm:function(){this.$emit("close",this.value),this.value="",this.discountPrice=0,this.preferential=0},change:function(e){console.log(this.selectGoodsInformation),this.discountPrice=Number(this.selectGoodsInformation.goods.discount_price)*(.01*Number(e)),this.preferential=Number(this.selectGoodsInformation.goods.discount_price)-this.discountPrice}}};n.default=o},"6e44":function(e,n,t){"use strict";t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Input":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--input/u--input")]).then(t.bind(null,"bead"))}},i=function(){var e=this,n=e.$createElement;e._self._c},u=[]},"84a3":function(e,n,t){"use strict";var o=t("0b33"),i=t.n(o);i.a},caec:function(e,n,t){"use strict";t.r(n);var o=t("6e44"),i=t("0085");for(var u in i)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(u);t("84a3");var c,r=t("f0c5"),s=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,"6e3c15d0",null,!1,o["a"],c);n["default"]=s.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/discountsPopup"],{"0085":function(e,n,t){"use strict";t.r(n);var o=t("20a80"),i=t.n(o);for(var u in o)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(u);n["default"]=i.a},"20a80":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{show:{typeof:Boolean,default:!1},selectGoodsInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{value:"",discountPrice:0,preferential:0}},methods:{close:function(){this.value="",this.discountPrice=0,this.preferential=0,this.$emit("close")},confirm:function(){this.$emit("close",this.value),this.value="",this.discountPrice=0,this.preferential=0},change:function(e){console.log(this.selectGoodsInformation),this.discountPrice=Number(this.selectGoodsInformation.goods.price)*(.01*Number(e)),this.preferential=Number(this.selectGoodsInformation.goods.price)-this.discountPrice}}};n.default=o},8482:function(e,n,t){},caec:function(e,n,t){"use strict";t.r(n);var o=t("f6f0"),i=t("0085");for(var u in i)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(u);t("f7e8");var c,r=t("f0c5"),s=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,"2051c91a",null,!1,o["a"],c);n["default"]=s.exports},f6f0:function(e,n,t){"use strict";t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Input":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--input/u--input")]).then(t.bind(null,"bead"))}},i=function(){var e=this,n=e.$createElement;e._self._c},u=[]},f7e8:function(e,n,t){"use strict";var o=t("8482"),i=t.n(o);i.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/discountsPopup-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.wxml

@@ -1 +1 @@
-<u-popup vue-id="1bfbde15-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-6e3c15d0" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-6e3c15d0"><block wx:if="{{selectGoodsInformation.goods}}"><view class="goods-information data-v-6e3c15d0"><image class="goods-img data-v-6e3c15d0" src="{{selectGoodsInformation.goods.image}}" mode></image><view class="goods-right data-v-6e3c15d0"><view class="title data-v-6e3c15d0">{{''+selectGoodsInformation.goods.name_cn+''}}</view><view class="price data-v-6e3c15d0">{{'￥'+selectGoodsInformation.goods.discount_price+''}}</view></view></view></block><view class="discount data-v-6e3c15d0"><view class="data-v-6e3c15d0">折扣</view><u--input vue-id="{{('1bfbde15-2')+','+('1bfbde15-1')}}" inputAlign="right" placeholder="打8折请输入80,以原价计算" border="none" type="number" maxlength="3" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-6e3c15d0" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-6e3c15d0">%</view></view><block wx:if="{{value}}"><view class="text-list data-v-6e3c15d0"><view class="_text-1 data-v-6e3c15d0"><text class="data-v-6e3c15d0">折扣价</text><text class="data-v-6e3c15d0">{{"￥"+discountPrice}}</text></view><view class="_text-1 data-v-6e3c15d0"><text class="data-v-6e3c15d0">优惠</text><text style="color:#f83224;" class="data-v-6e3c15d0">{{"-￥"+preferential}}</text></view></view></block><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-6e3c15d0" bindtap="__e">确定</button></view></u-popup>
+<u-popup vue-id="1bfbde15-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-2051c91a" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-2051c91a"><block wx:if="{{selectGoodsInformation.goods}}"><view class="goods-information data-v-2051c91a"><image class="goods-img data-v-2051c91a" src="{{selectGoodsInformation.goods.image}}" mode></image><view class="goods-right data-v-2051c91a"><view class="title data-v-2051c91a">{{''+selectGoodsInformation.goods.name_cn+''}}</view><view class="price data-v-2051c91a">{{'￥'+selectGoodsInformation.goods.discount_price+''}}</view></view></view></block><view class="discount data-v-2051c91a"><view class="data-v-2051c91a">折扣</view><u--input vue-id="{{('1bfbde15-2')+','+('1bfbde15-1')}}" inputAlign="right" placeholder="打8折请输入80,以原价计算" border="none" type="number" maxlength="3" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-2051c91a" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-2051c91a">%</view></view><block wx:if="{{value}}"><view class="text-list data-v-2051c91a"><view class="_text-1 data-v-2051c91a"><text class="data-v-2051c91a">折扣价</text><text class="data-v-2051c91a">{{"￥"+discountPrice}}</text></view><view class="_text-1 data-v-2051c91a"><text class="data-v-2051c91a">优惠</text><text style="color:#f83224;" class="data-v-2051c91a">{{"-￥"+preferential}}</text></view></view></block><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-2051c91a" bindtap="__e">确定</button></view></u-popup>

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.wxss

@@ -1 +1 @@
-.content.data-v-6e3c15d0{padding:30rpx 24rpx}.content .goods-information.data-v-6e3c15d0{display:flex;justify-content:flex-start}.content .goods-information .goods-img.data-v-6e3c15d0{width:104rpx;height:104rpx;border-radius:10rpx;margin-right:20rpx}.content .goods-information .goods-right.data-v-6e3c15d0{display:flex;flex-direction:column;justify-content:space-around;width:70%}.content .goods-information .goods-right .title.data-v-6e3c15d0{font-size:28rpx;color:#333;width:70%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.content .goods-information .goods-right .price.data-v-6e3c15d0{font-size:28rpx;opacity:.8;color:#333}.content .discount.data-v-6e3c15d0{display:flex;padding:36rpx;border-radius:10rpx;border:2rpx solid #f83224;margin-top:56rpx;font-size:30rpx;color:#222;align-items:center;font-weight:600}.content .text-list.data-v-6e3c15d0{border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:40rpx}.content .text-list ._text-1.data-v-6e3c15d0{display:flex;justify-content:space-between;height:100rpx;align-items:center;font-size:28rpx}.content .btn.data-v-6e3c15d0{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:30rpx}
+.content.data-v-2051c91a{padding:30rpx 24rpx}.content .goods-information.data-v-2051c91a{display:flex;justify-content:flex-start}.content .goods-information .goods-img.data-v-2051c91a{width:104rpx;height:104rpx;border-radius:10rpx;margin-right:20rpx}.content .goods-information .goods-right.data-v-2051c91a{display:flex;flex-direction:column;justify-content:space-around;width:70%}.content .goods-information .goods-right .title.data-v-2051c91a{font-size:28rpx;color:#333;width:70%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.content .goods-information .goods-right .price.data-v-2051c91a{font-size:28rpx;opacity:.8;color:#333}.content .discount.data-v-2051c91a{display:flex;padding:36rpx;border-radius:10rpx;border:2rpx solid #f83224;margin-top:56rpx;font-size:30rpx;color:#222;align-items:center;font-weight:600}.content .text-list.data-v-2051c91a{border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:40rpx}.content .text-list ._text-1.data-v-2051c91a{display:flex;justify-content:space-between;height:100rpx;align-items:center;font-size:28rpx}.content .btn.data-v-2051c91a{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:30rpx}

unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "",
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "commodity-detail-vue": "/pageD/orderDetail/component/commodityDetail"
+    "commodity-detail-vue": "/pageD/orderDetail/component/commodityDetail",
+    "remark": "/pageD/components/remark"
   }
 }

unpackage/dist/build/mp-weixin/pageD/supplyChainGoods/supplyChainGoods.wxml

@@ -1 +1 @@
-<view class="data-v-49d61f41"><view class="top-tab-search data-v-49d61f41"><u--input vue-id="7187bacf-1" placeholder="搜索商品名称" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" class="data-v-49d61f41" bind:__l="__l"></u--input><view class="tab data-v-49d61f41"><view class="top-tab data-v-49d61f41"><view data-event-opts="{{[['tap',[['tabSwitch',['null']]]]]}}" class="{{['tab','data-v-49d61f41',(follow=='null')?'commodity':'']}}" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['tabSwitch',['normal']]]]]}}" class="{{['tab','data-v-49d61f41',(follow=='normal')?'commodity':'']}}" bindtap="__e">已上架</view><view data-event-opts="{{[['tap',[['tabSwitch',[7]]]]]}}" class="{{['tab','data-v-49d61f41',(follow==7)?'commodity':'']}}" bindtap="__e">审核中</view><view data-event-opts="{{[['tap',[['tabSwitch',[2]]]]]}}" class="{{['tab','data-v-49d61f41',(follow==2)?'commodity':'']}}" bindtap="__e">审核失败</view><view data-event-opts="{{[['tap',[['tabSwitch',['down']]]]]}}" class="{{['tab','data-v-49d61f41',(follow=='down')?'commodity':'']}}" bindtap="__e">已下架</view></view></view></view><view class="page data-v-49d61f41"><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="data-v-49d61f41"><goods-information vue-id="{{'7187bacf-2-'+__i0__}}" productAndCommodity="product" status="{{status}}" itemInfo="{{item}}" data-event-opts="{{[['^toDetail',[['toDetail']]],['^goodsUpDown',[['goodsUpDown']]]]}}" bind:toDetail="__e" bind:goodsUpDown="__e" class="data-v-49d61f41" bind:__l="__l"></goods-information></view></block></view></view>
+<view class="data-v-62b0a054"><view class="top-tab-search data-v-62b0a054"><u--input vue-id="7187bacf-1" placeholder="搜索商品名称" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{searchValue}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','searchValue','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-62b0a054" bind:__l="__l"></u--input><view class="tab data-v-62b0a054"><view class="top-tab data-v-62b0a054"><view data-event-opts="{{[['tap',[['tabSwitch',['null']]]]]}}" class="{{['tab','data-v-62b0a054',(follow=='null')?'commodity':'']}}" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['tabSwitch',['normal']]]]]}}" class="{{['tab','data-v-62b0a054',(follow=='normal')?'commodity':'']}}" bindtap="__e">已上架</view><view data-event-opts="{{[['tap',[['tabSwitch',[7]]]]]}}" class="{{['tab','data-v-62b0a054',(follow==7)?'commodity':'']}}" bindtap="__e">审核中</view><view data-event-opts="{{[['tap',[['tabSwitch',[2]]]]]}}" class="{{['tab','data-v-62b0a054',(follow==2)?'commodity':'']}}" bindtap="__e">审核失败</view><view data-event-opts="{{[['tap',[['tabSwitch',['down']]]]]}}" class="{{['tab','data-v-62b0a054',(follow=='down')?'commodity':'']}}" bindtap="__e">已下架</view></view></view></view><view class="page data-v-62b0a054"><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="data-v-62b0a054"><goods-information vue-id="{{'7187bacf-2-'+__i0__}}" productAndCommodity="product" status="{{status}}" itemInfo="{{item}}" data-event-opts="{{[['^toDetail',[['toDetail']]],['^goodsUpDown',[['goodsUpDown']]]]}}" bind:toDetail="__e" bind:goodsUpDown="__e" class="data-v-62b0a054" bind:__l="__l"></goods-information></view></block></view></view>

unpackage/dist/build/mp-weixin/pageD/supplyChainGoods/supplyChainGoods.wxss

@@ -1 +1 @@
-.top-tab-search.data-v-49d61f41{background-color:#fff;padding:10rpx 24rpx}.top-tab-search .top-tab.data-v-49d61f41{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-49d61f41{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-49d61f41{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-49d61f41::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-49d61f41{padding:20rpx 24rpx}.footer.data-v-49d61f41{position:fixed;bottom:0;background-color:#fff;width:100%;padding:16rpx 24rpx 70rpx 24rpx}.footer .btn.data-v-49d61f41{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx}
+.top-tab-search.data-v-62b0a054{background-color:#fff;padding:10rpx 24rpx}.top-tab-search .top-tab.data-v-62b0a054{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-62b0a054{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-62b0a054{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-62b0a054::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-62b0a054{padding:20rpx 24rpx}.footer.data-v-62b0a054{position:fixed;bottom:0;background-color:#fff;width:100%;padding:16rpx 24rpx 70rpx 24rpx}.footer .btn.data-v-62b0a054{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx}

unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action/u-swipe-action.json

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