解决冲突

components/kj-chat/kj-chat.vue

@@ -108,13 +108,13 @@
 				typeof: Array,
 				default: []
 			},
-			user_other:{
-				type:Object,
-				default:{}
+			user_other: {
+				type: Object,
+				default: {}
 			},
-			user:{
-				type:Object,
-				default:{}
+			user: {
+				type: Object,
+				default: {}
 			}
 		},
 		data() {
@@ -239,7 +239,7 @@
 				let id = conn.getUniqueId(); // 生成本地消息id
 
 				let msg = new WebIM.message('txt', id); // 创建文本消息
-				console.log(msg);
+				console.log(this.user_other);
 				msg.set({
 					msg: this.text, // 消息内容
 					to: this.to, // 接收消息对象（用户id）
@@ -247,7 +247,8 @@
 					ext: {
 						// shopname:this.user_other.merchant_name,
 						// image:this.user_other.image,
-						user:this.user
+						user_other: this.user_other,
+						// user:this.user
 					},
 					success: function(id, serverMsgId) {
 						console.log('成功发送消息');
@@ -335,9 +336,10 @@
 					// 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
 					to: this.to,
 					ext: {
-						shopname:this.user_other.merchant_name,
-						image:this.user_other.image,
-						user:this.user
+						// shopname:this.user_other.merchant_name,
+						// image:this.user_other.image,
+						user_other: this.user_other,
+						// user:this.user
 					},
 				};
 				// 创建一条图片消息。

pageA/chat/chat.vue

@@ -289,6 +289,7 @@
 					searchDirection: "up",
 				};
 				conn.getHistoryMessages(options).then((res) => {
+						console.log('res', res);
 						// 成功获取历史消息。
 						if (res.isLast) {
 							this.loadText = '已无更多数据';

pageA/chat/news.vue

@@ -23,11 +23,11 @@
 		<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.image" style="width: 88rpx;height: 88rpx;" mode=""></image>
+				<image :src="item.lastMessage.ext.user_other.image" 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">{{item.lastMessage.ext.shopname}}</view>
-						<view class="name">{{item.lastMessage.ext.user}}</view>
+						<view class="name">{{item.lastMessage.ext.user_other.merchant_name}}</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)}}
@@ -78,7 +78,7 @@
 			chat(item) {
 				uni.navigateTo({
 					// url: '/pageA/chat/chat?user_other_no=' + item.from + '&user_other=' + encodeURIComponent(JSON.stringify(item.ext.user)) 
-					url: '/pageA/chat/chat?user_other_no=' + item.from 
+					url: '/pageA/chat/chat?user_other_no=' + item.to + '&user_other=' + encodeURIComponent(JSON.stringify(item.ext.user_other)) 
 				})
 			}  
 		}

pageA/order.vue

@@ -298,11 +298,13 @@
 				this.goodsPrice = options.goodsPrice
 				this.goodsWeight = options.goodsWeight
 				this.stringcheck = options.stringcheck
-				console.log(this.selelist);
 			} else if (options) {
 				this.value = options.value
 				this.sku_info = JSON.parse(decodeURIComponent(options.sku));
 				this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo))
+				if(options.share_merchant_id){
+					this.share_merchant_id = options.share_merchant_id
+				}
 				console.log(this.goodinfo);
 				console.log(this.sku_info);
 			}
@@ -543,11 +545,12 @@
 					sku_item_id: this.sku_info.id, //60	是	String	规格id
 					cart_ids: this.stringcheck, //8,9	是	String	购物车id
 					remark: '', //备注	是	String	备注
-					merchant_goods_id: this.goodinfo.merchant_goods_id, //39	是	String	团长商品id
+					merchant_goods_id: this.goodinfo.merchant_goods_id || '', //39	是	String	团长商品id
 					container_id: this.containid, //1	是	String	货柜id
-					share_merchant_id: '', //	是	String	分享团长id 分享商品的时候传
-					belong: 0 //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+					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(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

@@ -391,14 +391,14 @@
 					<text class="info" style="font-size: 32rpx">
 						{{ i18n.shar }}
 					</text>
-					<image  src="../static/images/index/bottom2.png" style="width: 40rpx; height: 40rpx">
+					<image src="../static/images/index/bottom2.png" style="width: 40rpx; height: 40rpx">
 					</image>
 				</view>
 				<!-- 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
 					
 				</view> -->
 				<view class="u-flex " style="margin-top: 82rpx; padding: 0 140rpx;justify-content: center;">
-<!-- 					<view class="" @click="copylink">
+					<!-- 					<view class="" @click="copylink">
 						<image src="../static/images/index/link.png" style="width: 108rpx; height: 108rpx" mode="">
 						</image>
 						<view class="link">{{ i18n.Copylink }}</view>
@@ -418,7 +418,7 @@
 		<u-popup :show="imagea" bgColor=" rgba(244, 244, 244, 0);" mode="center"
 			:customStyle="{ alignItems: 'center' }">
 			<view class="u-fle" style="display: flex; justify-content: flex-end; width: 100%">
-				<u-icon name="close" @click="imagea = false" color="#fff" size="28"></u-icon>
+				<u-icon name="close" @click="close()" color="#fff" size="28"></u-icon>
 			</view>
 			<image :src="picture2" mode="widthFix"></image>
 			<view class="button" style="width: 658rpx" @click="saveImage">保存到相册</view>
@@ -442,6 +442,7 @@
 	export default {
 		data() {
 			return {
+				share_merchant_id: '',
 				elementList: {
 					// images: [ //图片对象
 					// 	{
@@ -558,11 +559,6 @@
 			},
 		},
 		onLoad(options) {
-			if (uni.getStorageSync('user_info')) {
-				var user_info = uni.getStorageSync('user_info')
-				this.userid = user_info.id
-				console.log(this.userid);
-			}
 			console.log(options);
 			if (options.q && options.q != "undefined") {
 				// 获取到二维码原始链接内容
@@ -570,11 +566,18 @@
 				//此处就是我们要获取的参数 json，通过方法解析
 				let jsonUrl = this.GetwxUrlParam(qrUrl);
 				//比如我要得到id的值，直接取值即可
+				console.log('jsonUrl', jsonUrl);
 				let id = jsonUrl.id;
+				this.share_merchant_id = jsonUrl.userid;
 				this.id = id;
 				this.comment();
 				this.detail(this.id);
 			} else {
+				if (uni.getStorageSync('user_info')) {
+					var user_info = uni.getStorageSync('user_info')
+					this.userid = user_info.id
+					console.log(this.userid);
+				}
 				this.id = options.id;
 				this.comment();
 				this.detail(this.id);
@@ -685,6 +688,7 @@
 				this.show = false
 				this.share = false
 				this.serve = false
+				this.imagea = false
 			},
 			//评论页面
 			tocomment() {
@@ -853,7 +857,8 @@
 							"&value=" +
 							this.value +
 							"&goodinfo=" +
-							encodeURIComponent(JSON.stringify(this.goodinfo)),
+							encodeURIComponent(JSON.stringify(this.goodinfo)) + '&share_merchant_id=' + this
+							.share_merchant_id
 					});
 				} else {
 					this.$u.toast("库存为0");
@@ -879,7 +884,7 @@
 							sku_item_id: this.sku_info.id, //38 是 String 规格详情id
 							merchant_goods_id: this.goodinfo.merchant_goods_id, //38 是 String 团长商品id
 							belong: this.goodinfo.source, //是 String 商品归属 0 团长 1 平台自营 2 团长发布或者分享的平台自营商品、 供应链商品
-							share_merchant_id: "", //是 String 分享团长id
+							share_member_id:this.share_merchant_id, //是 String 分享团长id
 						})
 						.then((res) => {
 							this.$u.toast("添加成功");

pageB/ParcelExpress.vue

@@ -192,8 +192,11 @@
 				this.internationalshow = false
 			},
 			internationalshowa() {
-				this.internationalshow = true
-				this.international()
+				// this.internationalshow = true
+				// this.international()
+				uni.navigateTo({
+					url:'/pageB/xieyi'
+				})
 			},
 			//国际快递服务协议
 			international() {

pageB/delivery.vue

@@ -200,8 +200,9 @@
 		methods: {
 			//协议
 			internationalshowa() {
-				this.internationalshow = true
-				this.international()
+				uni.navigateTo({
+					url:'/pageB/xieyi'
+				})
 			},
 			//国际快递服务协议
 			international() {

pageB/xieyi.vue

@@ -0,0 +1,63 @@
+<template>
+	<view class="page">
+		<!-- <view class="" style="text-align: center;">{{contenttitle}}</view> -->
+		<u-parse :content="content"></u-parse>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				content: "",
+				contenttitle:'',
+				language:'zh-CN'
+			};
+		},
+		onLoad(options) {
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
+		},
+		methods: {
+			getAgreementContent() {
+				uni.$u.http.get(`/api/agreement?code=international_express_service`).then((res) => {
+					if (this.language == 'zh-CN') {
+						this.content = res.content_cn
+						this.contenttitle = res.name_cn
+					}
+					if (this.language == 'en-US') {
+						this.content = res.content_en
+						this.contenttitle = res.name_en
+					}
+					if (this.language == 'es-ES') {
+						this.content = res.content_es
+						this.contenttitle = res.content_ita
+					}
+					if (this.language == 'it-IT') {
+						this.content = res.content_cn
+						this.contenttitle = res.name_ita
+					}
+					uni.setNavigationBarTitle({
+						title:this.contenttitle
+					})
+				});
+			},
+		},
+		mounted() {
+			this.getAgreementContent();
+		},
+	};
+</script>
+
+<style>
+	.page {
+		width: 94vw;
+		background-color: #fff;
+		padding: 0 24rpx;
+		font-size: 28rpx;
+		color: #222;
+		opacity: 0.6;
+		min-height: calc(100vh);
+	}
+</style>

pages.json

@@ -302,6 +302,14 @@
 						"navigationBarTitleText" : "物品信息",
 						"enablePullDownRefresh" : false
 					}
+				},
+				{
+					"path" : "xieyi",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh" : false
+					}
 				}
 			]
 		},

pages/cart/cart.vue

@@ -1,885 +1,805 @@
 <template>
-  <!-- 购物车 -->
-  <view class="page" @click="num = ''">
-    <u-navbar :safeAreaInsetTop="true" :placeholder="true">
-      <view class="u-nav-slot" slot="left">
-        <view class="">
-          <text class="shopcart">{{ i18n.Shopping }}</text>
-          <text class="sum">({{ goodsNum }})</text>
-        </view>
-      </view>
-      <view class="u-nav-slot" slot="right">
-        <view class="u-flex">
-          <text @click="admin" v-if="success">{{ i18n.manage }}</text>
-          <text @click="admin" v-else>{{ i18n.complete }}</text>
-          <view class="" style="width: 200rpx"></view>
-        </view>
-      </view>
-    </u-navbar>
-    <u-checkbox-group
-      v-model="checkboxValue1"
-      placement="column"
-      @change="checkboxChange"
-    >
-      <view class="box" v-for="(item, idx) in goodsList" :key="idx">
-        <view class="item">
-          <view class="shopname u-flex">
-            <image
-              src="/static/mine/354.png"
-              class="circle"
-              mode="scaleToFill"
-              @click="shopSelectAll(item.goods)"
-              v-if="shop(item.goods)"
-            />
-            <image
-              src="/static/mine/353.png"
-              class="circle"
-              mode="scaleToFill"
-              @click="shopSelectAll(item.goods)"
-              v-else
-            />
-
-            <image
-              :src="item.image"
-              style="width: 28rpx; height: 28rpx"
-              mode=""
-            ></image>
-            <text>{{ item.merchant_name }}</text>
-            <image
-              src="/static/express/next1.png"
-              style="width: 32rpx; height: 32rpx"
-              mode=""
-            ></image>
-          </view>
-          <u-swipe-action>
-            <view
-              class="u-flex"
-              style="margin-top: 30rpx; width: 100%"
-              v-for="(chid, index) in item.goods"
-              :key="index"
-            >
-              <u-swipe-action-item
-                ref="show"
-                :options="options2"
-                @click="followOrdelete"
-                :autoClose="true"
-                :name="chid.cart.id"
-                :disabled="chid.status == 'down'"
-              >
-                <!-- 				<view class="" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 100;background-color: rgba(255, 255, 255, 0.5);"></view> -->
-                <u-checkbox
-                  shape="circle"
-                  :customStyle="{ marginBottom: '8px' }"
-                  :name="chid.cart.id"
-                  activeColor="#F83224"
-                  :disabled="chid.status == 'down'"
-                >
-                </u-checkbox>
-                <view
-                  class=""
-                  style="
+	<!-- 购物车 -->
+	<view class="page" @click="num = ''">
+		<u-navbar :safeAreaInsetTop="true" :placeholder="true">
+			<view class="u-nav-slot" slot="left">
+				<view class="">
+					<text class="shopcart">{{ i18n.Shopping }}</text>
+					<text class="sum">({{ goodsNum }})</text>
+				</view>
+			</view>
+			<view class="u-nav-slot" slot="right">
+				<view class="u-flex">
+					<text @click="admin" v-if="success">{{ i18n.manage }}</text>
+					<text @click="admin" v-else>{{ i18n.complete }}</text>
+					<view class="" style="width: 200rpx"></view>
+				</view>
+			</view>
+		</u-navbar>
+		<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+			<view class="box" v-for="(item, idx) in goodsList" :key="idx">
+				<view class="item">
+					<view class="shopname u-flex">
+						<image src="/static/mine/354.png" class="circle" mode="scaleToFill"
+							@click="shopSelectAll(item.goods)" v-if="shop(item.goods)" />
+						<image src="/static/mine/353.png" class="circle" mode="scaleToFill"
+							@click="shopSelectAll(item.goods)" v-else />
+
+						<image :src="item.image" style="width: 28rpx; height: 28rpx" mode=""></image>
+						<text>{{ item.merchant_name }}</text>
+						<image src="/static/express/next1.png" style="width: 32rpx; height: 32rpx" mode=""></image>
+					</view>
+					<u-swipe-action>
+						<view class="u-flex" style="margin-top: 30rpx; width: 100%" v-for="(chid, index) in item.goods"
+							:key="index">
+							<u-swipe-action-item ref="show" :options="options2" @click="followOrdelete"
+								:autoClose="true" :name="chid.cart.id" :disabled="chid.status == 'down'">
+								<!-- 				<view class="" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 100;background-color: rgba(255, 255, 255, 0.5);"></view> -->
+								<u-checkbox shape="circle" :customStyle="{ marginBottom: '8px' }" :name="chid.cart.id"
+									activeColor="#F83224" :disabled="chid.status == 'down'">
+								</u-checkbox>
+								<view class="" style="
                     position: relative;
                     width: 172rpx;
                     height: 172rpx;
                     border-radius: 16rpx;
-                  "
-                >
-                  <image
-                    :src="chid.image"
-                    style="width: 172rpx; height: 172rpx; border-radius: 20rpx"
-                    mode=""
-                  >
-                  </image>
-                  <view class="down" v-if="chid.status == 'down'">
-                    <view class="sold"> 商品下架 </view>
-                  </view>
-                </view>
-                <view
-                  class="good"
-                  style="flex: 1; margin-left: 10rpx; width: 65%"
-                >
-                  <view class="goodname">{{ chid.name_cn }}</view>
-                  <view class="goods" v-if="chid.sku_item.length > 0">{{
+                  ">
+									<image :src="chid.image" style="width: 172rpx; height: 172rpx; border-radius: 20rpx"
+										mode="">
+									</image>
+									<view class="down" v-if="chid.status == 'down'">
+										<view class="sold"> 商品下架 </view>
+									</view>
+								</view>
+								<view class="good" style="flex: 1; margin-left: 10rpx; width: 65%">
+									<view class="goodname">{{ chid.name_cn }}</view>
+									<view class="goods" v-if="chid.sku_item.length > 0">{{
                     chid.sku_item[0].item
                   }}</view>
-                  <view class="" style="margin-top: 21rpx">
-                    <view
-                      class="goodtab"
-                      v-for="itemLabel in chid.label_arr"
-                      :key="itemLabel.id"
-                    >
-                      {{ itemLabel.name_cn }}</view
-                    >
-                  </view>
-                  <view
-                    class="u-flex u-row-between"
-                    style="width: 100%; margin-top: 20rpx"
-                  >
-                    <view class="" v-if="chid.sku_item.length > 0">
-                      <text class="money">¥</text>
-                      <text class="money" style="font-size: 30rpx">{{
+									<view class="" style="margin-top: 21rpx">
+										<view class="goodtab" v-for="itemLabel in chid.label_arr" :key="itemLabel.id">
+											{{ itemLabel.name_cn }}
+										</view>
+									</view>
+									<view class="u-flex u-row-between" style="width: 100%; margin-top: 20rpx">
+										<view class="" v-if="chid.sku_item.length > 0">
+											<text class="money">¥</text>
+											<text class="money" style="font-size: 30rpx">{{
                         chid.sku_item[0].discount_price.split(".")[0]
                       }}</text>
-                      <text class="money"
-                        >.{{ chid.sku_item[0].discount_price.split(".")[1] }}</text
-                      >
-                      <text class="weight"
-                        >{{ chid.sku_item[0].weight }}kg</text
-                      >
-                    </view>
-                    <view class="aaaaaa">
-                      <!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
-                      <view class="" v-if="num == chid.cart.id && success">
-                        <!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
-                        <u-number-box
-                          v-model="chid.cart.goods_num"
-                          @change="addOrReduce"
-                        >
-                          <view slot="minus" class="minus">
-                            <u-icon
-                              name="minus"
-                              color="#B5B5B5"
-                              size="12"
-                            ></u-icon>
-                          </view>
-                          <text
-                            slot="input"
-                            style="
+											<text
+												class="money">.{{ chid.sku_item[0].discount_price.split(".")[1] }}</text>
+											<text class="weight">{{ chid.sku_item[0].weight }}kg</text>
+										</view>
+										<view class="aaaaaa">
+											<!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
+											<view class="" v-if="num == chid.cart.id && success">
+												<!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
+												<u-number-box v-model="chid.cart.goods_num" @change="addOrReduce">
+													<view slot="minus" class="minus">
+														<u-icon name="minus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+													<text slot="input" style="
                               width: 50px;
                               text-align: center;
                               font-size: 20rpx;
-                            "
-                            class="input"
-                            >{{ chid.cart.goods_num }}</text
-                          >
-                          <view slot="plus" class="plus">
-                            <u-icon
-                              name="plus"
-                              color="#B5B5B5"
-                              size="12"
-                            ></u-icon>
-                          </view>
-                        </u-number-box>
-                      </view>
-                      <view
-                        class="num"
-                        v-if="
+                            " class="input">{{ chid.cart.goods_num }}</text>
+													<view slot="plus" class="plus">
+														<u-icon name="plus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+												</u-number-box>
+											</view>
+											<view class="num" v-if="
                           num != chid.cart.id &&
                           success &&
                           chid.status == 'normal'
-                        "
-                        @click.stop="num = chid.cart.id"
-                      >
-                        x{{ chid.cart.goods_num }}
-                      </view>
-                      <view
-                        v-if="success && chid.status == 'down'"
-                        class="del"
-                        @click="
+                        " @click.stop="num = chid.cart.id">
+												x{{ chid.cart.goods_num }}
+											</view>
+											<view v-if="success && chid.status == 'down'" class="del" @click="
                           followOrdelete({
                             index: 1,
                             name: chid.cart.id,
                           })
-                        "
-                        >删除</view
-                      >
-                    </view>
-                    <view
-                      v-if="success == false"
-                      class="icon delete-1"
-                      @click="
+                        ">删除</view>
+										</view>
+										<view v-if="success == false" class="icon delete-1" @click="
                         followOrdelete({
                           index: 1,
                           name: chid.cart.id,
                         })
-                      "
-                    >
-                      <u-icon name="trash" color="#fff" size="20"></u-icon>
-                    </view>
-                  </view>
-                </view>
-              </u-swipe-action-item>
-            </view>
-          </u-swipe-action>
-        </view>
-      </view>
-    </u-checkbox-group>
-    <u-toast ref="uToast"></u-toast>
-    <view class="" style="height: 260rpx"></view>
-    <view class="back-top" @click="backTop">
-      <image
-        class="back-icon"
-        src="../../static/mine/355.png"
-        mode="scaleToFill"
-      />
-      <text class="back-text">顶部</text>
-    </view>
-    <kj-tabbar
-      ref="tabbar1"
-      :value1="3"
-      :success="success"
-      @allSelect="allSelect"
-      :goodsWeight="goodsWeight"
-      :goodsPrice="String(goodsPrice.toFixed(2))"
-      :goodsList="goodsList"
-      :checkboxValue1="checkboxValue1"
-      @selectDelete="selectDelete"
-    ></kj-tabbar>
-  </view>
+                      ">
+											<u-icon name="trash" color="#fff" size="20"></u-icon>
+										</view>
+									</view>
+								</view>
+							</u-swipe-action-item>
+						</view>
+					</u-swipe-action>
+				</view>
+			</view>
+		</u-checkbox-group>
+		<u-toast ref="uToast"></u-toast>
+		<view class="" style="height: 260rpx"></view>
+		<view class="back-top" @click="backTop">
+			<image class="back-icon" src="../../static/mine/355.png" mode="scaleToFill" />
+			<text class="back-text">顶部</text>
+		</view>
+		<kj-tabbar ref="tabbar1" :value1="3" :success="success" @allSelect="allSelect" :goodsWeight="goodsWeight"
+			:goodsPrice="String(goodsPrice.toFixed(2))" :goodsList="goodsList" :checkboxValue1="checkboxValue1"
+			@selectDelete="selectDelete"></kj-tabbar>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      dele: true,
-      success: true,
-      shopitem: -1,
-      checkboxValue1: [], //商品数组
-      value: 0,
-      all: [], //全选数组
-      goodsList: [],
-      selectall: -1,
-      goodsNum: 0, //购物车商品数量
-      num: false,
-      goodsWeight: 0, //商品重量
-      goodsPrice: 0, //商品价格
-      options2: [
-        {
-          text: "移入关注",
-          style: {
-            backgroundColor: "#FFB115",
-          },
-        },
-        {
-          text: "删除",
-          style: {
-            backgroundColor: "#F83224",
-          },
-        },
-      ],
-      tabarheight: "",
-      removeProducts: 0, //已下架的商品数量
-    };
-  },
-  watch: {},
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  onLoad() {
-    const systemInfo = wx.getSystemInfoSync();
-    const tab =
-      systemInfo.screenHeight -
-      systemInfo.safeArea.bottom +
-      systemInfo.statusBarHeight;
-    this.tabarheight = tab;
-  },
-  onShow() {
-    this.getShopCarList();
-  },
-  methods: {
-    //返回顶部
-    backTop() {
-      uni.pageScrollTo({
-        scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
-        duration: 300, // 滚动动画的时长
-      });
-    },
-    //商品下架之后的商品字体颜色
-    getFontColor(status) {
-      if (status == "down") {
-        return "color:rgba(51, 51, 51, .6)";
-      }
-    },
-
-    //关注商品 or 删除商品
-    followOrdelete(e) {
-      //关注商品
-      if (e.index == 0) {
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            if (e.name == items.cart.id) {
-              console.log(items);
-              uni.$u.http
-                .post(`/api/interest/follow`, {
-                  interest_type: 0,
-                  interest_id: items.merchant_goods.id,
-                })
-                .then((res) => {
-                  this.$refs.show.forEach((item) => item.closeHandler(true));
-                  console.log(res);
-                  uni.showToast({
-                    title: "关注成功",
-                    icon: "none",
-                  });
-                });
-            }
-          });
-        });
-      } else {
-        //删除商品
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            if (e.name == items.cart.id) {
-              uni.$u.http
-                .delete(`/api/cart?ids=${items.cart.id}`)
-                .then((res) => {
-                  this.$refs.uToast.show({
-                    type: "default",
-                    title: "默认主题",
-                    message: "删除成功",
-                  });
-                  //删除后关闭滑动打开的单元格
-                  this.$refs.show.forEach((item) => item.closeHandler(true));
-                  this.getShopCarList();
-                });
-            }
-          });
-        });
-      }
-    },
-
-    //多选删除
-    selectDelete() {
-      let goodsIdList = []; //筛选选中的商品id
-      this.goodsList.map((item) => {
-        item.goods.map((items) => {
-          if (this.checkboxValue1.indexOf(items.cart.id) >= 0) {
-            goodsIdList.push(items.cart.id);
-          }
-        });
-      });
-      uni.$u.http
-        .delete(`/api/cart`, { ids: goodsIdList.join(",") })
-        .then((res) => {
-          this.$refs.uToast.show({
-            type: "default",
-            title: "默认主题",
-            message: "删除成功",
-          });
-          this.checkboxValue1 = [];
-          this.getShopCarList();
-        });
-    },
-
-    shop(value) {
-      let num = 0;
-      value.map((item) => {
-        if (this.checkboxValue1.indexOf(item.cart.id) >= 0) {
-          num++;
-        }
-      });
-      return num;
-    },
-
-    //获取排除下架的商品之后的商品数量
-    getNormalGoodsNum(value) {
-      let num = 0;
-      value.map((item) => {
-        if (item.status != "down") {
-          num++;
-        }
-      });
-      return num;
-    },
-
-    //修改购物车商品数量
-    addOrReduce(n) {
-      console.log(n);
-      uni.$u.http
-        .post(`/api/cart/num/${this.num}`, {
-          goods_num: n.value,
-          type: "",
-        })
-        .then((res) => {
-          console.log(res);
-        });
-    },
-
-    //店铺商品全选
-    shopSelectAll(value) {
-      this.goodsPrice = 0;
-      this.goodsWeight = 0;
-      //先判断存放选中的数组有没有选中的数据
-      if (this.checkboxValue1.length == 0) {
-        //没有数据则直接将选中店铺中的商品存入数组
-        value.map((item) => {
-          //商品下架不得选中
-          if (item.status != "down") {
-            this.checkboxValue1.push(item.cart.id);
-          }
-        });
-      } else {
-        if (
-          this.shop(value) > 0 &&
-          this.shop(value) == this.getNormalGoodsNum(value)
-        ) {
-          value.map((item) => {
-            //先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中
-            if (this.checkboxValue1.indexOf(item.cart.id) >= 0) {
-              this.checkboxValue1.splice(
-                this.checkboxValue1.indexOf(item.cart.id),
-                1
-              );
-            }
-          });
-        } else if (
-          (this.shop(value) > 0 &&
-            this.shop(value) != this.getNormalGoodsNum(value)) ||
-          this.shop(value) == 0
-        ) {
-          value.map((item) => {
-            //先判断选中的商品数组中该店铺商品是否已被选中，未被选中则推入选中状态，商品下架不得选中
-            if (
-              this.checkboxValue1.indexOf(item.cart.id) == -1 &&
-              item.status != "down"
-            ) {
-              this.checkboxValue1.push(item.cart.id);
-            }
-          });
-        }
-      }
-      if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
-        this.$refs.tabbar1.cancelAll();
-      } else {
-        this.$refs.tabbar1.cancelAll("取消");
-      }
-
-      //将选中的商品价格相加
-      this.goodsList.map((item) => {
-        item.goods.map((items) => {
-          if (this.checkboxValue1.indexOf(items.cart.id) > -1) {
-            this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
-            this.goodsPrice +=
-              Number(items.sku_item[0].discount_price) * items.cart.goods_num;
-          }
-        });
-      });
-      this.shop(value);
-    },
-    admin() {
-      console.log(this.checkboxValue1);
-      this.success = !this.success;
-    },
-    valChange(e) {
-      console.log("当前值为: " + e.value);
-    },
-    //全选
-    checkAll(e) {
-      console.log("all", e);
-    },
-    //购物车单选
-    checkboxChange(n) {
-      console.log(n);
-      //首先将价格和商品重量重置
-      this.goodsWeight = 0;
-      this.goodsPrice = 0;
-      this.checkboxValue1 = n;
-      this.goodsList.map((item) => {
-        item.goods.map((items) => {
-          if (n.indexOf(items.cart.id) > -1) {
-            this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
-            this.goodsPrice +=
-              Number(items.sku_item[0].discount_price) * items.cart.goods_num;
-          }
-        });
-      });
-      //判断是否全部选中
-      if (
-        this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
-        this.goodsNum != 0
-      ) {
-        this.$refs.tabbar1.cancelAll();
-      } else if (
-        this.checkboxValue1.length <
-        this.goodsNum - this.removeProducts
-      ) {
-        this.$refs.tabbar1.cancelAll("取消");
-      }
-    },
-    //购物车全选
-    allSelect() {
-      const all = this.$refs.tabbar1.cancelAll("全选");
-      if (
-        this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
-        all.length == 0
-      ) {
-        return;
-      }
-      //判断是否已经全选，如已全选，则取消全选
-      if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
-        this.checkboxValue1 = [];
-        this.goodsPrice = 0;
-        this.goodsWeight = 0;
-      } else {
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            //判断是否有商品已被选中
-            if (
-              this.checkboxValue1.indexOf(items.cart.id) == -1 &&
-              items.status != "down"
-            ) {
-              this.checkboxValue1.push(items.cart.id);
-              this.goodsWeight +=
-                items.sku_item[0].weight * items.cart.goods_num;
-              this.goodsPrice +=
-                Number(items.sku_item[0].discount_price) * items.cart.goods_num;
-            }
-          });
-        });
-      }
-    },
-    //获取购物车数据
-    getShopCarList() {
-      this.goodsNum = 0;
-      uni.$u.http.get(`/api/cart`).then((res) => {
-        this.goodsList = res.data;
-        //循环店铺，获取购物车商品数量
-        this.goodsList.map((item) => {
-          this.goodsNum += item.goods.length;
-          item.goods.map((items) => {
-            if (items.status == "down") {
-              this.removeProducts++;
-            }
-          });
-        });
-      });
-    },
-  },
-  // mounted() {
-  //   this.getShopCarList();
-  // },
-};
+	export default {
+		data() {
+			return {
+				dele: true,
+				success: true,
+				shopitem: -1,
+				checkboxValue1: [], //商品数组
+				value: 0,
+				all: [], //全选数组
+				goodsList: [],
+				selectall: -1,
+				goodsNum: 0, //购物车商品数量
+				num: false,
+				goodsWeight: 0, //商品重量
+				goodsPrice: 0, //商品价格
+				options2: [{
+						text: "移入关注",
+						style: {
+							backgroundColor: "#FFB115",
+						},
+					},
+					{
+						text: "删除",
+						style: {
+							backgroundColor: "#F83224",
+						},
+					},
+				],
+				tabarheight: "",
+				removeProducts: 0, //已下架的商品数量
+			};
+		},
+		watch: {},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		onLoad() {
+			const systemInfo = wx.getSystemInfoSync();
+			const tab =
+				systemInfo.screenHeight -
+				systemInfo.safeArea.bottom +
+				systemInfo.statusBarHeight;
+			this.tabarheight = tab;
+		},
+		onShow() {
+			this.getShopCarList();
+		},
+		methods: {
+			//返回顶部
+			backTop() {
+				uni.pageScrollTo({
+					scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+					duration: 300, // 滚动动画的时长
+				});
+			},
+			//商品下架之后的商品字体颜色
+			getFontColor(status) {
+				if (status == "down") {
+					return "color:rgba(51, 51, 51, .6)";
+				}
+			},
+
+			//关注商品 or 删除商品
+			followOrdelete(e) {
+				//关注商品
+				if (e.index == 0) {
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							if (e.name == items.cart.id) {
+								console.log(items);
+								uni.$u.http
+									.post(`/api/interest/follow`, {
+										interest_type: 0,
+										interest_id: items.merchant_goods.id,
+									})
+									.then((res) => {
+										this.$refs.show.forEach((item) => item.closeHandler(true));
+										console.log(res);
+										uni.showToast({
+											title: "关注成功",
+											icon: "none",
+										});
+									});
+							}
+						});
+					});
+				} else {
+					//删除商品
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							if (e.name == items.cart.id) {
+								uni.$u.http
+									.delete(`/api/cart?ids=${items.cart.id}`)
+									.then((res) => {
+										this.$refs.uToast.show({
+											type: "default",
+											title: "默认主题",
+											message: "删除成功",
+										});
+										//删除后关闭滑动打开的单元格
+										this.$refs.show.forEach((item) => item.closeHandler(true));
+										this.getShopCarList();
+									});
+							}
+						});
+					});
+				}
+			},
+
+			//多选删除
+			selectDelete() {
+				let goodsIdList = []; //筛选选中的商品id
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (this.checkboxValue1.indexOf(items.cart.id) >= 0) {
+							goodsIdList.push(items.cart.id);
+						}
+					});
+				});
+				uni.$u.http
+					.delete(`/api/cart`, {
+						ids: goodsIdList.join(",")
+					})
+					.then((res) => {
+						this.$refs.uToast.show({
+							type: "default",
+							title: "默认主题",
+							message: "删除成功",
+						});
+						this.checkboxValue1 = [];
+						this.getShopCarList();
+					});
+			},
+
+			shop(value) {
+				let num = 0;
+				value.map((item) => {
+					if (this.checkboxValue1.indexOf(item.cart.id) >= 0) {
+						num++;
+					}
+				});
+				return num;
+			},
+
+			//获取排除下架的商品之后的商品数量
+			getNormalGoodsNum(value) {
+				let num = 0;
+				value.map((item) => {
+					if (item.status != "down") {
+						num++;
+					}
+				});
+				return num;
+			},
+
+			//修改购物车商品数量
+			addOrReduce(n) {
+				console.log(n);
+				uni.$u.http
+					.post(`/api/cart/num/${this.num}`, {
+						goods_num: n.value,
+						type: "",
+					})
+					.then((res) => {
+						this.goodsPrice = 0;
+						this.goodsWeight = 0;
+						this.goodsList.map((item) => {
+							item.goods.map((items) => {
+								//判断是否有商品已被选中
+								if (
+									this.checkboxValue1.indexOf(items.cart.id) != -1 &&
+									items.status != "down"
+								) {
+									this.goodsWeight +=
+										items.sku_item[0].weight * items.cart.goods_num;
+									this.goodsPrice +=
+										Number(items.sku_item[0].discount_price) * items.cart
+										.goods_num;
+								}
+							});
+						});
+					});
+			},
+
+			//店铺商品全选
+			shopSelectAll(value) {
+				this.goodsPrice = 0;
+				this.goodsWeight = 0;
+				//先判断存放选中的数组有没有选中的数据
+				if (this.checkboxValue1.length == 0) {
+					//没有数据则直接将选中店铺中的商品存入数组
+					value.map((item) => {
+						//商品下架不得选中
+						if (item.status != "down") {
+							this.checkboxValue1.push(item.cart.id);
+						}
+					});
+				} else {
+					if (
+						this.shop(value) > 0 &&
+						this.shop(value) == this.getNormalGoodsNum(value)
+					) {
+						value.map((item) => {
+							//先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中
+							if (this.checkboxValue1.indexOf(item.cart.id) >= 0) {
+								this.checkboxValue1.splice(
+									this.checkboxValue1.indexOf(item.cart.id),
+									1
+								);
+							}
+						});
+					} else if (
+						(this.shop(value) > 0 &&
+							this.shop(value) != this.getNormalGoodsNum(value)) ||
+						this.shop(value) == 0
+					) {
+						value.map((item) => {
+							//先判断选中的商品数组中该店铺商品是否已被选中，未被选中则推入选中状态，商品下架不得选中
+							if (
+								this.checkboxValue1.indexOf(item.cart.id) == -1 &&
+								item.status != "down"
+							) {
+								this.checkboxValue1.push(item.cart.id);
+							}
+						});
+					}
+				}
+				if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
+					this.$refs.tabbar1.cancelAll();
+				} else {
+					this.$refs.tabbar1.cancelAll("取消");
+				}
+
+				//将选中的商品价格相加
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (this.checkboxValue1.indexOf(items.cart.id) > -1) {
+							this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
+							this.goodsPrice +=
+								Number(items.sku_item[0].discount_price) * items.cart.goods_num;
+						}
+					});
+				});
+				this.shop(value);
+			},
+			admin() {
+				console.log(this.checkboxValue1);
+				this.success = !this.success;
+			},
+			valChange(e) {
+				console.log("当前值为: " + e.value);
+			},
+			//全选
+			checkAll(e) {
+				console.log("all", e);
+			},
+			//购物车单选
+			checkboxChange(n) {
+				console.log(n);
+				//首先将价格和商品重量重置
+				this.goodsWeight = 0;
+				this.goodsPrice = 0;
+				this.checkboxValue1 = n;
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (n.indexOf(items.cart.id) > -1) {
+							this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
+							this.goodsPrice +=
+								Number(items.sku_item[0].discount_price) * items.cart.goods_num;
+						}
+					});
+				});
+				//判断是否全部选中
+				if (
+					this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
+					this.goodsNum != 0
+				) {
+					this.$refs.tabbar1.cancelAll();
+				} else if (
+					this.checkboxValue1.length <
+					this.goodsNum - this.removeProducts
+				) {
+					this.$refs.tabbar1.cancelAll("取消");
+				}
+			},
+			//购物车全选
+			allSelect() {
+				const all = this.$refs.tabbar1.cancelAll("全选");
+				if (
+					this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
+					all.length == 0
+				) {
+					return;
+				}
+				//判断是否已经全选，如已全选，则取消全选
+				if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
+					this.checkboxValue1 = [];
+					this.goodsPrice = 0;
+					this.goodsWeight = 0;
+				} else {
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							//判断是否有商品已被选中
+							if (
+								this.checkboxValue1.indexOf(items.cart.id) == -1 &&
+								items.status != "down"
+							) {
+								this.checkboxValue1.push(items.cart.id);
+								this.goodsWeight +=
+									items.sku_item[0].weight * items.cart.goods_num;
+								this.goodsPrice +=
+									Number(items.sku_item[0].discount_price) * items.cart.goods_num;
+							}
+						});
+					});
+				}
+			},
+			//获取购物车数据
+			getShopCarList() {
+				this.goodsNum = 0;
+				uni.$u.http.get(`/api/cart`).then((res) => {
+					this.goodsList = res.data;
+					//循环店铺，获取购物车商品数量
+					this.goodsList.map((item) => {
+						this.goodsNum += item.goods.length;
+						item.goods.map((items) => {
+							if (items.status == "down") {
+								this.removeProducts++;
+							}
+						});
+					});
+				});
+			},
+		},
+		// mounted() {
+		//   this.getShopCarList();
+		// },
+	};
 </script>
 
 <style lang="scss" scoped>
-.page {
-  position: relative;
-
-  .back-top {
-    position: fixed;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    width: 88rpx;
-    height: 88rpx;
-    background-color: #fff;
-    border-radius: 50%;
-    bottom: 280rpx;
-    right: 20rpx;
-    z-index: 1000;
-
-    .back-icon {
-      width: 32rpx;
-      height: 30rpx;
-    }
-
-    .back-text {
-      font-size: 20rpx;
-      color: #555;
-    }
-  }
-}
-
-.sold {
-  width: 108rpx;
-  height: 36rpx;
-  background: rgba(0, 0, 0, 0.4);
-  border-radius: 18rpx;
-  // padding: 0 14rpx;
-  text-align: center;
-  box-sizing: border-box;
-  line-height: 36rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #ffffff;
-  font-style: normal;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin-top: -18rpx;
-  margin-left: -54rpx;
-}
-
-.delect {
-  // width: 68rpx;
-  height: 44rpx;
-  line-height: 44rpx;
-  border-radius: 22rpx;
-  border: 1rpx solid #ff1515;
-  padding: 0 14rpx;
-  box-sizing: border-box;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #ff1515;
-  text-align: center;
-  font-style: normal;
-}
-
-.allweight {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.sum {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.summon {
-  font-family: JDZhengHT, JDZhengHT;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #ff1515;
-  line-height: 30rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.settle {
-  width: 176rpx;
-  height: 68rpx;
-  background: #f83224;
-  border-radius: 38rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #ffffff;
-  line-height: 68rpx;
-  text-align: center;
-  font-style: normal;
-  margin-left: 20rpx;
-}
-
-.icon {
-  width: 40rpx;
-  height: 40rpx;
-  background: #f83224;
-  border-radius: 12rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.dle {
-  width: 136rpx;
-  height: 60rpx;
-  border-radius: 38rpx;
-  border: 1rpx solid #979797;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #333333;
-  line-height: 60rpx;
-  text-align: center;
-  font-style: normal;
-}
-
-::v-deep .u-swipe-action-item__content {
-  flex-direction: row !important;
-}
-
-::v-deep .u-swipe-action-item__right__button__wrapper {
-  width: 32px;
-  word-wrap: break-word;
-  font-size: 20rpx !important;
-}
-
-::v-deep .u-swipe-action-item__right__button__wrapper__text {
-  word-wrap: break-word;
-}
-
-::v-deep .u-swipe-action-item {
-  width: 100% !important;
-}
-
-::v-deep .u-swipe-action-item__right {
-  top: 2rpx !important;
-  right: 2rpx !important;
-  bottom: 2rpx !important;
-}
-
-.bottom {
-  width: 750rpx;
-  height: 100rpx;
-  background: #ffffff;
-  padding: 0 24rpx;
-  box-sizing: border-box;
-}
-
-.num {
-  width: 40rpx;
-  height: 40rpx;
-  border-radius: 20rpx;
-  border: 1rpx solid rgba(151, 151, 151, 0.4);
-  font-family: HarmonyOS_Sans;
-  font-size: 20rpx;
-  color: #222222;
-  line-height: 40rpx;
-  text-align: center;
-  font-style: normal;
-}
-
-.del {
-  width: 68rpx;
-  height: 44rpx;
-  text-align: center;
-  line-height: 44rpx;
-  border: 2rpx solid #f83224;
-  color: #f83224;
-  font-size: 20rpx;
-  border-radius: 22rpx;
-}
-
-.box {
-  padding: 0rpx 24rpx 20rpx;
-  margin-top: 20rpx;
-  box-sizing: border-box;
-
-  .item {
-    padding: 36rpx 20rpx;
-    box-sizing: border-box;
-    width: 702rpx;
-    // height: 556rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 20rpx;
-      color: #ff1515;
-      line-height: 26rpx;
-      text-align: left;
-      font-style: normal;
-    }
-
-    .weight {
-      font-family: SFPro, SFPro;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #333333;
-      line-height: 24rpx;
-      text-align: left;
-      font-style: normal;
-      margin-left: 12rpx;
-    }
-
-    .goodtab {
-      // width: 96rpx;
-      height: 32rpx;
-      border-radius: 4rpx;
-      border: 1rpx solid #ff1515;
-      padding: 2rpx 8rpx;
-      box-sizing: border-box;
-      text-align: center;
-      line-height: 32rpx;
-      display: inline;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #ff1515;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-      margin-right: 6rpx;
-    }
-
-    .goods {
-      // width: 284rpx;
-      height: 40rpx;
-      background: #f4f4f4;
-      border-radius: 8rpx;
-      display: inline;
-      text-align: center;
-      line-height: 40rpx;
-      margin-top: 20rpx;
-      padding: 6rpx 12rpx;
-      box-sizing: border-box;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #555555;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-    }
-
-    .goodname {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      word-break: break-all;
-      white-space: nowrap;
-      width: 100%;
-    }
-
-    .shopname {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 26rpx;
-      color: #333333;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-
-      .circle {
-        width: 32rpx;
-        height: 32rpx;
-        margin-right: 10rpx;
-      }
-    }
-  }
-}
-
-.shopcart {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 36rpx;
-  color: #222222;
-  line-height: 50rpx;
-  text-align: right;
-  font-style: normal;
-}
-
-.sum {
-  font-family: HarmonyOS_Sans;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.down {
-  position: absolute;
-  top: 0;
-  left: 0;
-  background-color: #c7c7c7;
-  opacity: 0.7;
-  width: 100%;
-  height: 100%;
-  z-index: 10000;
-  border-radius: 20rpx;
-}
-</style>
+	.page {
+		position: relative;
+
+		.back-top {
+			position: fixed;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			width: 88rpx;
+			height: 88rpx;
+			background-color: #fff;
+			border-radius: 50%;
+			bottom: 280rpx;
+			right: 20rpx;
+			z-index: 1000;
+
+			.back-icon {
+				width: 32rpx;
+				height: 30rpx;
+			}
+
+			.back-text {
+				font-size: 20rpx;
+				color: #555;
+			}
+		}
+	}
+
+	.sold {
+		width: 108rpx;
+		height: 36rpx;
+		background: rgba(0, 0, 0, 0.4);
+		border-radius: 18rpx;
+		// padding: 0 14rpx;
+		text-align: center;
+		box-sizing: border-box;
+		line-height: 36rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #ffffff;
+		font-style: normal;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin-top: -18rpx;
+		margin-left: -54rpx;
+	}
+
+	.delect {
+		// width: 68rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		border-radius: 22rpx;
+		border: 1rpx solid #ff1515;
+		padding: 0 14rpx;
+		box-sizing: border-box;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #ff1515;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.allweight {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.sum {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.summon {
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #ff1515;
+		line-height: 30rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.settle {
+		width: 176rpx;
+		height: 68rpx;
+		background: #f83224;
+		border-radius: 38rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #ffffff;
+		line-height: 68rpx;
+		text-align: center;
+		font-style: normal;
+		margin-left: 20rpx;
+	}
+
+	.icon {
+		width: 40rpx;
+		height: 40rpx;
+		background: #f83224;
+		border-radius: 12rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.dle {
+		width: 136rpx;
+		height: 60rpx;
+		border-radius: 38rpx;
+		border: 1rpx solid #979797;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #333333;
+		line-height: 60rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	::v-deep .u-swipe-action-item__content {
+		flex-direction: row !important;
+	}
+
+	::v-deep .u-swipe-action-item__right__button__wrapper {
+		width: 32px;
+		word-wrap: break-word;
+		font-size: 20rpx !important;
+	}
+
+	::v-deep .u-swipe-action-item__right__button__wrapper__text {
+		word-wrap: break-word;
+	}
+
+	::v-deep .u-swipe-action-item {
+		width: 100% !important;
+	}
+
+	::v-deep .u-swipe-action-item__right {
+		top: 2rpx !important;
+		right: 2rpx !important;
+		bottom: 2rpx !important;
+	}
+
+	.bottom {
+		width: 750rpx;
+		height: 100rpx;
+		background: #ffffff;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+	}
+
+	.num {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 20rpx;
+		border: 1rpx solid rgba(151, 151, 151, 0.4);
+		font-family: HarmonyOS_Sans;
+		font-size: 20rpx;
+		color: #222222;
+		line-height: 40rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.del {
+		width: 68rpx;
+		height: 44rpx;
+		text-align: center;
+		line-height: 44rpx;
+		border: 2rpx solid #f83224;
+		color: #f83224;
+		font-size: 20rpx;
+		border-radius: 22rpx;
+	}
+
+	.box {
+		padding: 0rpx 24rpx 20rpx;
+		margin-top: 20rpx;
+		box-sizing: border-box;
+
+		.item {
+			padding: 36rpx 20rpx;
+			box-sizing: border-box;
+			width: 702rpx;
+			// height: 556rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 20rpx;
+				color: #ff1515;
+				line-height: 26rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.weight {
+				font-family: SFPro, SFPro;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #333333;
+				line-height: 24rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 12rpx;
+			}
+
+			.goodtab {
+				// width: 96rpx;
+				height: 32rpx;
+				border-radius: 4rpx;
+				border: 1rpx solid #ff1515;
+				padding: 2rpx 8rpx;
+				box-sizing: border-box;
+				text-align: center;
+				line-height: 32rpx;
+				display: inline;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #ff1515;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+				margin-right: 6rpx;
+			}
+
+			.goods {
+				// width: 284rpx;
+				height: 40rpx;
+				background: #f4f4f4;
+				border-radius: 8rpx;
+				display: inline;
+				text-align: center;
+				line-height: 40rpx;
+				margin-top: 20rpx;
+				padding: 6rpx 12rpx;
+				box-sizing: border-box;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #555555;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.goodname {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				white-space: nowrap;
+				width: 100%;
+			}
+
+			.shopname {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 26rpx;
+				color: #333333;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+
+				.circle {
+					width: 32rpx;
+					height: 32rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+
+	.shopcart {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #222222;
+		line-height: 50rpx;
+		text-align: right;
+		font-style: normal;
+	}
+
+	.sum {
+		font-family: HarmonyOS_Sans;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.down {
+		position: absolute;
+		top: 0;
+		left: 0;
+		background-color: #c7c7c7;
+		opacity: 0.7;
+		width: 100%;
+		height: 100%;
+		z-index: 10000;
+		border-radius: 20rpx;
+	}
+</style>

pages/login/login.vue

@@ -1,27 +1,17 @@
 <template>
-  <!-- 登录 -->
-  <view
-    style="
+	<!-- 登录 -->
+	<view style="
       padding: 0 44rpx;
       background-color: #fff;
       height: 100vh;
       overflow: hidden;
-    "
-  >
-    <view class="" style="text-align: center; margin-top: 156rpx">
-      <image
-        src="../../static/images/logo.png"
-        style="width: 350rpx; height: 350rpx"
-        mode=""
-      ></image>
-    </view>
-    <button
-      open-type="getPhoneNumber"
-      class="login-btn"
-      @getphonenumber="tologin"
-    >
-      微信授权登录
-    </button>
+    ">
+		<view class="" style="text-align: center; margin-top: 156rpx">
+			<image src="../../static/images/logo.png" style="width: 350rpx; height: 350rpx" mode=""></image>
+		</view>
+		<button open-type="getPhoneNumber" class="login-btn" @getphonenumber="tologin">
+			微信授权登录
+		</button>
 
 
 		<view>
@@ -45,7 +35,9 @@
 
 <script>
 	// import {conn} from '@/utils/WebIM.js'
-	import {conn} from '../../utils/WebIM.js'
+	import {
+		conn
+	} from '../../utils/WebIM.js'
 	import {
 		login
 	} from "../../network/api/homeApi.js";
@@ -69,7 +61,7 @@
 								uni.$u.http
 									.post("/api/wxmini/login", {
 										code: code.code,
-									})  
+									})
 									.then((res) => {
 										console.log(res);
 										if (res == 10011) {
@@ -86,17 +78,18 @@
 														})
 														.then((res) => {
 															console.log(res);
-															uni.setStorageSync('user_no',res.easemob_username)
-															uni.setStorageSync('pwd',res.easemob_password)
+															uni.setStorageSync('user_no', res
+																.easemob_username)
+															uni.setStorageSync('pwd', res
+																.easemob_password)
 															var options = {
-															  user: res.easemob_username,
-															  pwd: res.easemob_password,
-															  appKey: conn.appkey,
-															  success: function (res2) {
-																								
-															  },
-															  error: function(){
-															  }
+																user: res.easemob_username,
+																pwd: res.easemob_password,
+																appKey: conn.appkey,
+																success: function(res2) {
+
+																},
+																error: function() {}
 															};
 															conn.open(options);
 															uni.setStorageSync("token", res.token);
@@ -116,6 +109,20 @@
 											uni.setStorageSync("token", res.token);
 											uni.setStorageSync("openid", res.openid);
 											uni.setStorageSync("user_info", res);
+											uni.setStorageSync('user_no', res
+												.easemob_username)
+											uni.setStorageSync('pwd', res
+												.easemob_password)
+											var options = {
+												user: res.easemob_username,
+												pwd: res.easemob_password,
+												appKey: conn.appkey,
+												success: function(res2) {
+
+												},
+												error: function() {}
+											};
+											conn.open(options);
 											setTimeout(() => {
 												uni.navigateTo({
 													url: "/pageA/changelange",
@@ -158,17 +165,16 @@
 					.then((res) => {
 						uni.setStorageSync("token", res.token);
 						uni.setStorageSync("user_info", res);
-						uni.setStorageSync('user_no',res.easemob_username)
-						uni.setStorageSync('pwd',res.easemob_password)
+						uni.setStorageSync('user_no', res.easemob_username)
+						uni.setStorageSync('pwd', res.easemob_password)
 						var options = {
-						  user: res.easemob_username,
-						  pwd: res.easemob_password,
-						  appKey: conn.appkey,
-						  success: function (res2) {
-								console.log(res2);							
-						  },
-						  error: function(){
-						  }
+							user: res.easemob_username,
+							pwd: res.easemob_password,
+							appKey: conn.appkey,
+							success: function(res2) {
+								console.log(res2);
+							},
+							error: function() {}
 						};
 						conn.open(options);
 						uni.switchTab({
@@ -194,37 +200,36 @@
 			}
 		},
 	};
-
 </script>
 
 <style lang="scss" scoped>
-page {
-  background-color: #ffffff !important;
-  height: 100vh;
-}
+	page {
+		background-color: #ffffff !important;
+		height: 100vh;
+	}
 
-.login-btn {
-  width: 662rpx;
-  height: 96rpx;
-  background: #f83224;
-  box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
-  border-radius: 48rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #ffffff;
-  line-height: 96rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.login-btn {
+		width: 662rpx;
+		height: 96rpx;
+		background: #f83224;
+		box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+		border-radius: 48rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #ffffff;
+		line-height: 96rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.fontYin {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #666666;
-  line-height: 34rpx;
-  text-align: left;
-  font-style: normal;
-}
-</style>
+	.fontYin {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #666666;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
+</style>

unpackage/dist/build/mp-weixin/app.json

@@ -47,7 +47,8 @@
         "end",
         "expresstype",
         "orderinfo",
-        "search"
+        "search",
+        "xieyi"
       ]
     },
     {

unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1 +1 @@
-.payment.data-v-290806e8{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-290806e8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-290806e8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-290806e8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-290806e8{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-290806e8{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-290806e8{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-290806e8{position:relative}.back .topbox .state.data-v-290806e8{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-290806e8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-290806e8{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+.payment.data-v-e70e993a{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-e70e993a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-e70e993a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-e70e993a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-e70e993a{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-e70e993a{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-e70e993a{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-e70e993a{position:relative}.back .topbox .state.data-v-e70e993a{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-e70e993a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-e70e993a{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

unpackage/dist/build/mp-weixin/pageC/orderForm/orderForm.wxss

@@ -1 +1 @@
-.inp.data-v-c5db310a{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-c5db310a{padding:0 24rpx 50rpx}.top-tab.data-v-c5db310a{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-c5db310a{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.top-tab .commodity.data-v-c5db310a{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-c5db310a::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}
+.inp.data-v-8d9beb04{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-8d9beb04{padding:0 24rpx 50rpx}.top-tab.data-v-8d9beb04{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-8d9beb04{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.top-tab .commodity.data-v-8d9beb04{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-8d9beb04::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"504a":function(t,n,e){},"52a1":function(t,n,e){"use strict";var o=e("504a"),a=e.n(o);a.a},"7a07":function(t,n,e){"use strict";e.r(n);var o=e("abee"),a=e("9516");for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("52a1");var u,r=e("f0c5"),c=Object(r["a"])(a["default"],o["b"],o["c"],!1,null,"5cb20660",null,!1,o["a"],u);n["default"]=c.exports},9516:function(t,n,e){"use strict";e.r(n);var o=e("9bdc"),a=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=a.a},"9bdc":function(t,n,e){"use strict";var o=e("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=o(e("9523")),i=(0,a.default)({props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},computed:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}}},"computed",{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"},downOrGrounding:function(){return"down"!=this.itemInfo.goods.status&&"down"!=this.itemInfo.status}});n.default=i},abee:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var a=function(){var t=this,n=t.$createElement,e=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),o=t.itemInfo.goods.discount_price.split("."),a=t.itemInfo.goods.discount_price.split(".");t.$mp.data=Object.assign({},{$root:{g0:e,g1:o,g2:a}})},i=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"0f1b":function(t,n,o){"use strict";var e=o("6bc0"),i=o.n(e);i.a},"6bc0":function(t,n,o){},"7a07":function(t,n,o){"use strict";o.r(n);var e=o("d7ef"),i=o("9516");for(var u in i)["default"].indexOf(u)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(u);o("0f1b");var r,c=o("f0c5"),a=Object(c["a"])(i["default"],e["b"],e["c"],!1,null,"3433bc12",null,!1,e["a"],r);n["default"]=a.exports},9516:function(t,n,o){"use strict";o.r(n);var e=o("9bdc"),i=o.n(e);for(var u in e)["default"].indexOf(u)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(u);n["default"]=i.a},"9bdc":function(t,n,o){"use strict";var e=o("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=e(o("9523")),u=(0,i.default)({props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},computed:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}}},"computed",{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"},downOrGrounding:function(){return"down"!=this.itemInfo.goods.status&&"down"!=this.itemInfo.status}});n.default=u},d7ef:function(t,n,o){"use strict";var e;o.d(n,"b",(function(){return i})),o.d(n,"c",(function(){return u})),o.d(n,"a",(function(){return e}));var i=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e=t.itemInfo.goods.discount_price.split("."),i=t.itemInfo.goods.discount_price.split(".");t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:i}})},u=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/goodsInformation-create-component',
     {

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

@@ -1 +1 @@
-<view class="data-v-e13933c0"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="__i0__"><view class="content data-v-e13933c0"><view class="goods-title data-v-e13933c0"><image class="goods-img data-v-e13933c0" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-e13933c0">立白大师香氛洗衣液持久留香香水机洗护理洗…</view></view><view class="rate data-v-e13933c0"><view class="_label data-v-e13933c0">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+__i0__}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-e13933c0" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+__i0__}}" fileList="{{fileList1}}" name="1" multiple="{{true}}" maxCount="{{10}}" accept="all" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-e13933c0" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-e13933c0"><u-icon vue-id="{{('4a6a8fa2-3-'+__i0__)+','+('4a6a8fa2-2-'+__i0__)}}" name="camera" size="26" class="data-v-e13933c0" bind:__l="__l"></u-icon><text class="data-v-e13933c0">添加图片/视频</text></view></u-upload><view class="_text data-v-e13933c0"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+__i0__}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-e13933c0" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-e13933c0" bindtap="__e">提交评价</button></view>
+<view class="data-v-4d48263a"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="__i0__"><view class="content data-v-4d48263a"><view class="goods-title data-v-4d48263a"><image class="goods-img data-v-4d48263a" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-4d48263a">{{''+item.goods_name+''}}</view></view><view class="rate data-v-4d48263a"><view class="_label data-v-4d48263a">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+__i0__}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-4d48263a" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+__i0__}}" fileList="{{fileList1}}" name="1" multiple="{{true}}" maxCount="{{10}}" accept="all" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-4d48263a" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-4d48263a"><u-icon vue-id="{{('4a6a8fa2-3-'+__i0__)+','+('4a6a8fa2-2-'+__i0__)}}" name="camera" size="26" class="data-v-4d48263a" bind:__l="__l"></u-icon><text class="data-v-4d48263a">添加图片/视频</text></view></u-upload><view class="_text data-v-4d48263a"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+__i0__}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-4d48263a" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-4d48263a" bindtap="__e">提交评价</button></view>

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

@@ -1 +1 @@
-.content.data-v-e13933c0{background-color:#fff;padding:40rpx 24rpx}.content .goods-title.data-v-e13933c0{display:flex;justify-content:flex-start;align-items:center}.content .goods-title .goods-img.data-v-e13933c0{width:52rpx;height:52rpx;border-radius:6rpx}.content .goods-title .title.data-v-e13933c0{font-size:24rpx;color:rgba(51,51,51,.5);margin-left:20rpx}.content .rate.data-v-e13933c0{display:flex;align-items:center;margin-bottom:20rpx}.content .rate ._label.data-v-e13933c0{font-size:32rpx;font-weight:600;margin-right:22rpx}.content ._text.data-v-e13933c0{margin-top:32rpx;padding-top:26rpx;border-top:2rpx solid hsla(0,0%,59.2%,.1)}.content .upload-photo.data-v-e13933c0{width:180rpx;height:180rpx;border:2rpx dashed #979797;border-radius:8rpx;display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:24rpx;color:rgba(34,34,34,.8)}.content.data-v-e13933c0  .u-textarea{background-color:#fff}.btn-1.data-v-e13933c0{background-color:#f83224;color:#fff;border-radius:40rpx;height:80rpx;line-height:80rpx;width:90%;margin:0 auto;margin-top:70rpx;font-size:32rpx}
+.content.data-v-4d48263a{background-color:#fff;padding:40rpx 24rpx}.content .goods-title.data-v-4d48263a{display:flex;justify-content:flex-start;align-items:center}.content .goods-title .goods-img.data-v-4d48263a{width:52rpx;height:52rpx;border-radius:6rpx}.content .goods-title .title.data-v-4d48263a{font-size:24rpx;color:rgba(51,51,51,.5);margin-left:20rpx}.content .rate.data-v-4d48263a{display:flex;align-items:center;margin-bottom:20rpx}.content .rate ._label.data-v-4d48263a{font-size:32rpx;font-weight:600;margin-right:22rpx}.content ._text.data-v-4d48263a{margin-top:32rpx;padding-top:26rpx;border-top:2rpx solid hsla(0,0%,59.2%,.1)}.content .upload-photo.data-v-4d48263a{width:180rpx;height:180rpx;border:2rpx dashed #979797;border-radius:8rpx;display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:24rpx;color:rgba(34,34,34,.8)}.content.data-v-4d48263a  .u-textarea{background-color:#fff}.btn-1.data-v-4d48263a{background-color:#f83224;color:#fff;border-radius:40rpx;height:80rpx;line-height:80rpx;width:90%;margin:0 auto;margin-top:70rpx;font-size:32rpx}