解决冲突

commont/http.interceptor.js

@@ -1,58 +1,58 @@
 // 此vm参数为页面的实例，可以通过它引用vuex中的变量
 module.exports = (vm) => {
-  // 初始化请求配置
-  uni.$u.http.setConfig((config) => {
-    /* config 为默认全局配置*/
-    config.baseURL = "https://cbec.hdlkeji.com"; /* 根域名 */
-    return config;
-  });
+	// 初始化请求配置
+	uni.$u.http.setConfig((config) => {
+		/* config 为默认全局配置*/
+		config.baseURL = "https://cbec.hdlkeji.com"; /* 根域名 */
+		return config;
+	});
 
-  // 请求拦截
-  uni.$u.http.interceptors.request.use(
-    (config) => {
-      // 可使用async await 做异步操作
-      // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
-      config.data = config.data || {};
-      // 根据custom参数中配置的是否需要token，添加对应的请求头
-      // if(config?.custom?.auth) {
-      // 可以在此通过vm引用vuex中的变量，具体值在vm.$store.state中
-      const token = uni.getStorageSync("token");
-      config.header.Authorization = "Bearer" + " " + token;
-      // }
-      return config;
-    },
-    (config) => {
-      // 可使用async await 做异步操作
-      return Promise.reject(config);
-    }
-  );
+	// 请求拦截
+	uni.$u.http.interceptors.request.use(
+		(config) => {
+			// 可使用async await 做异步操作
+			// 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
+			config.data = config.data || {};
+			// 根据custom参数中配置的是否需要token，添加对应的请求头
+			// if(config?.custom?.auth) {
+			// 可以在此通过vm引用vuex中的变量，具体值在vm.$store.state中
+			const token = uni.getStorageSync("token");
+			config.header.Authorization = "Bearer" + " " + token;
+			// }
+			return config;
+		},
+		(config) => {
+			// 可使用async await 做异步操作
+			return Promise.reject(config);
+		}
+	);
 
-  // 响应拦截
-  uni.$u.http.interceptors.response.use(
-    (res) => {
-      /* 对响应成功做点什么 可使用async await 做异步操作*/
-      const data = res.data;
-      // 自定义参数
-      const custom = res.config?.custom;
-      if (data.code !== 10000) {
-        // 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
-        if (custom.toast !== false) {
-          uni.$u.toast(data.message);
-        }
+	// 响应拦截
+	uni.$u.http.interceptors.response.use(
+		(res) => {
+			/* 对响应成功做点什么 可使用async await 做异步操作*/
+			const data = res.data;
+			// 自定义参数
+			const custom = res.config?.custom;
+			if (data.code !== 10000 && data.code !== 10011) {
+				// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
+				if (custom.toast !== false) {
+					uni.$u.toast(data.message);
+				}
 
-        // 如果需要catch返回，则进行reject
-        if (custom?.catch) {
-          return Promise.reject(data);
-        } else {
-          // 否则返回一个pending中的promise，请求不会进入catch中
-          return new Promise(() => {});
-        }
-      }
-      return data.data === undefined ? {} : data.data;
-    },
-    (res) => {
-      // 对响应错误做点什么 （statusCode !== 200）
-      return Promise.reject(res);
-    }
-  );
-};
+				// 如果需要catch返回，则进行reject
+				if (custom?.catch) {
+					return Promise.reject(data);
+				} else {
+					// 否则返回一个pending中的promise，请求不会进入catch中
+					return new Promise(() => {});
+				}
+			}
+			return data.data === undefined ? {} : data.data;
+		},
+		(res) => {
+			// 对响应错误做点什么 （statusCode !== 200）
+			return Promise.reject(res);
+		}
+	);
+};

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "wx",
+    "name" : "kjds",
     "appid" : "__UNI__EF90963",
     "description" : "",
     "versionName" : "1.0.0",

pageA/order.vue

@@ -24,7 +24,8 @@
 					style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;flex:1">
 					<view class="">
 						<text>{{goodinfo.name_cn}}</text>
-						<view class="weight">{{sku_info.item}} {{Number(sku_info.weight)*value}}kg</view>
+						<view class="weight">{{sku_info.item}} </view>
+						<!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
 					</view>
 					<view class="u-flex u-row-between">
 						<view class="">
@@ -63,8 +64,8 @@
 			</view>
 			<view class="bottom">
 				<scroll-view scroll-x class="u-flex" style="column: gap 28rpx; display: flex;">
-					<view class="u-flex">
-						<view class="" v-for="(item,idx) in swiptlist" :key="idx">
+					<view class="u-flex" style="column-gap: 16rpx; ">
+						<view class="" v-for="(item,idx) in swiptlist" :key="idx" @click="">
 							<image :src="item.image" style="width: 156rpx;height: 156rpx;" mode="">
 							</image>
 							<view class="title" v-if="language =='zh-CN'">
@@ -181,7 +182,7 @@
 					<view class="transport" style="margin-top: 32rpx;" @click="activea(item,idx)"
 						v-for="(item,idx) in containlist" v-if="item.sum !=0">
 						<view class="u-flex u-row-between">
-							<text class="yundate">{{i18n.Shipmentdate}} {{item.begin_date}}</text>
+							<text class="yundate">{{i18n.Shipmentdate}} {{item.end_date}}</text>
 							<image v-if="datechan==idx" src="/pageA/static/images/active.png"
 								style="width: 36rpx;height: 36rpx;" mode=""></image>
 							<image v-else src="/pageA/static/images/unactive.png" style="width: 36rpx;height: 36rpx;"
@@ -244,6 +245,8 @@
 				max_weight: '',
 				min_weight: '',
 				unit_fee: '',
+				addinfo: '',
+				huoid: ''
 			};
 		},
 		computed: {
@@ -258,6 +261,7 @@
 				this.sku_info = JSON.parse(decodeURIComponent(options.sku));
 				this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo))
 				console.log(this.goodinfo);
+				console.log(this.sku_info);
 			}
 		},
 		onShow() {
@@ -338,7 +342,10 @@
 						province_id: this.province_id,
 						transport_type_id: this.transport_type_id,
 						weight: Number(this.sku_info.weight) * this.value,
-						type: this.goodinfo.cate == 0 ? 'normal' : 'special'
+						type: this.goodinfo.cate == 0 ? 'normal' : 'special',
+						length: Number(this.goodinfo.length) * this.value, //		是	String	长
+						width: this.goodinfo.width, //		是	String	宽
+						height: this.goodinfo.height, //		是	String	高
 					}
 				}).then((res) => {
 					// this.containlist = res
@@ -368,6 +375,34 @@
 
 				})
 			},
+			//运费满减
+			config() {
+				var that = this
+				uni.$u.http.get('/api/config', {
+					params: {
+						module: 'free_shipping'
+					}
+				}).then((res) => {
+					let goodsum = ''
+					if (that.goodinfo.is_discount == 1) {
+						goodsum = Number(that.sku_info.price * 100) * Number(that.value * 100) / 10000
+						console.log('that.sum', that.sum);
+						console.log('that.goodsum', goodsum);
+						if (goodsum > res.free_shipping) {
+							that.sum = 0;
+							that.unit_price = 0;
+						}
+					} else {
+						goodsum = Number(that.sku_info.discount_price * 100) * Number(that.value * 100) /10000
+						if (goodsum > res.free_shipping) {
+							that.sum = 0
+							that.unit_price = 0
+						}
+					}
+				}).catch(() => {
+
+				})
+			},
 			//商品推荐
 			recommend() {
 				uni.$u.http.post('/api/goods/recommend', {
@@ -416,6 +451,7 @@
 				this.sum = item.sum
 				this.unit_price = item.unit_price
 				this.recommend_weight = item.recommend_weight
+				this.containid = item.id
 				if (this.language == 'zh-CN') {
 					this.containname = item.name_cn
 				}
@@ -434,6 +470,7 @@
 				this.show1 = false
 				this.containname1 = this.containname
 				this.recommendweight()
+				this.config()
 			},
 			// 取消
 			close() {
@@ -756,6 +793,12 @@
 				text-align: left;
 				font-style: normal;
 				width: 148rpx;
+				height: 64rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				-webkit-line-clamp: 2;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
 			}
 
 			.top {

pageA/payorder.vue

@@ -97,13 +97,25 @@
 				sum: '',
 				pay_type: 'balance',
 				orderid: '',
-				balance:'',
+				balance: '',
+				type: '',
+				exchange_rate_id: '',
+				balance1: 0,
+				sum1: ''
 			};
 		},
 		onLoad(options) {
+			this.sum1 = options.sum
 			this.sum = options.sum
+			console.log(this.sum);
 			this.orderid = options.orderid
-			this.userinfo()
+			if (options.type) {
+				this.type = options.type
+			}
+		},
+		onShow() {
+			this.ratelist()
+			// this.userinfo()
 		},
 		computed: {
 			i18n() {
@@ -111,21 +123,50 @@
 			}
 		},
 		methods: {
+			//用户信息
 			userinfo() {
 				uni.$u.http.get('/api/member/info', {}).then((res) => {
 					this.balance = res.balance
+					this.balance1 = this.balance
+					this.calculate1(this.balance1)
+				}).catch(() => {
+
+				})
+			},
+			//汇率列表
+			ratelist() {
+				uni.$u.http.get('/api/exchange-rate', {}).then((res) => {
+					this.array = res.reverse()
+					this.exchange_rate_id = this.array[0].id
+					this.userinfo()
+					this.calculate()
+				}).catch(() => {
+
+				})
+			},
+			//汇率价格
+			calculate() {
+				uni.$u.http.post('/api/exchange-rate/calculate/' + this.exchange_rate_id, {
+					price: this.sum1
+				}).then((res) => {
+					this.sum = res.amount
+				}).catch(() => {
+
+				})
+			},
+			calculate1(balance) {
+				uni.$u.http.post('/api/exchange-rate/calculate/' + this.exchange_rate_id, {
+					price: balance
+				}).then((res) => {
+					this.balance = res.amount
 				}).catch(() => {
 
 				})
 			},
 			change(idx) {
 				this.mode = idx
-			},
-			statechange(item, idx) {
-				this.state = item.name
-				this.state_id = idx
 				if (idx == 0) {
-					this.pay_type = 'balance'  
+					this.pay_type = 'balance'
 				}
 				if (idx == 1) {
 					this.pay_type = 'wechat'
@@ -133,17 +174,44 @@
 				if (idx == 2) {
 					this.pay_type = 'customer'
 				}
+			},
+			statechange(item, idx) {
+				this.state = item.name
+				this.state_id = idx
+				this.exchange_rate_id = item.id
 				this.stateshow = !this.stateshow
+				this.calculate()
+				this.calculate1(this.balance1)
 			},
 			confirm() {
-				uni.$u.http.post('/api/order/payment', {
-					order_id: this.orderid,
-					pay_type: this.pay_type
-				}).then((res) => {
-					uni.navigateTo({
-						url: 'confirm'
-					})
-				}).catch(() => {})
+				if (this.type == '') {
+					uni.$u.http.post('/api/order/payment', {
+						order_id: this.orderid,
+						pay_type: this.pay_type
+					}).then((res) => {
+						uni.navigateTo({
+							url: 'confirm'
+						})
+					}).catch(() => {})
+				} else {
+					uni.$u.http.post('/api/pay', {
+						order_id: this.orderid,
+						pay_type: this.pay_type,
+						type: this.type,
+						exchange_rate_id: this.exchange_rate_id
+					}).then((res) => {
+						console.log(res);
+						this.$u.toast('支付成功')
+						setTimeout(() => {
+							uni.switchTab({
+								url: '/pages/express/express'
+							})
+						}, 800)
+						// uni.navigateTo({
+						// 	url: 'confirm'
+						// })
+					}).catch(() => {})
+				}
 			}
 		}
 	}

pageA/productdetails.vue

@@ -1,1512 +1,1290 @@
 <template>
-  <view>
-    <scroll-view
-      ref="scrollView"
-      scroll-y="true"
-      scroll-with-animation="true"
-      style="min-height: 100%"
-      :scroll-into-view="toView"
-    >
-      <!-- 页面内容 -->
-      <!-- 自定义导航栏 -->
-      <u-navbar :safeAreaInsetTop="true" :placeholder="true">
-        <view class="u-nav-slot u-flex" slot="left" style="display: flex">
-          <view class="u-flex">
-            <u-icon
-              name="arrow-left"
-              size="19"
-              @click="navigateBack()"
-            ></u-icon>
-            <u-tabs
-              :duration="duration"
-              @click="scrollToPosition"
-              :list="list1"
-              lineColor="#fff"
-              :activeStyle="{ color: '#FF1515' }"
-              :inactiveStyle="{
+	<view>
+		<scroll-view ref="scrollView" scroll-y="true" scroll-with-animation="true" style="min-height: 100%"
+			:scroll-into-view="toView">
+			<!-- 页面内容 -->
+			<!-- 自定义导航栏 -->
+			<u-navbar :safeAreaInsetTop="true" :placeholder="true">
+				<view class="u-nav-slot u-flex" slot="left" style="display: flex">
+					<view class="u-flex">
+						<u-icon name="arrow-left" size="19" @click="navigateBack()"></u-icon>
+						<u-tabs :duration="duration" @click="scrollToPosition" :list="list1" lineColor="#fff"
+							:activeStyle="{ color: '#FF1515' }" :inactiveStyle="{
                 color: ' #666666',
-              }"
-            ></u-tabs>
-          </view>
-          <!-- 				<view class="" style="margin-left: 184rpx;" @click="share = true">
+              }"></u-tabs>
+					</view>
+					<!-- 				<view class="" style="margin-left: 184rpx;" @click="share = true">
 					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
 				</view> -->
-        </view>
-        <view class="u-nav-slot u-flex" slot="right" style="display: flex">
-          <view class="" style="margin-left: 184rpx" @click="share = true">
-            <image
-              src="static/images/share.png"
-              style="width: 38rpx; height: 38rpx"
-              mode=""
-            ></image>
-          </view>
-          <view class="" style="width: 180rpx"></view>
-        </view>
-      </u-navbar>
-      <!-- 商品图片 -->
-      <view class="uni-margin-wrap" id="scroll0">
-        <swiper
-          class="swiper"
-          circular
-          :indicator-dots="false"
-          :autoplay="true"
-        >
-          <swiper-item v-if="goodinfo.video">
-            <video
-              style="width: 750rpx; height: 750rpx"
-              :src="goodinfo.video"
-            ></video>
-          </swiper-item>
-          <swiper-item
-            v-for="(item, idx) in goodinfo.images.split(',')"
-            :key="idx"
-          >
-            <image
-              :src="goodinfo.image"
-              style="width: 750rpx; height: 750rpx"
-              mode=""
-            ></image>
-          </swiper-item>
-        </swiper>
-      </view>
-      <view class="back">
-        <!-- 折扣 -->
-        <view class="discount">
-          <view class="top">
-            <text class="count" v-if="goodinfo.is_discount == 0">{{
+				</view>
+				<view class="u-nav-slot u-flex" slot="right" style="display: flex">
+					<view class="" style="margin-left: 184rpx" @click="sharea">
+						<image src="static/images/share.png" style="width: 38rpx; height: 38rpx" mode=""></image>
+					</view>
+					<view class="" style="width: 180rpx"></view>
+				</view>
+			</u-navbar>
+			<!-- 商品图片 -->
+			<view class="uni-margin-wrap" id="scroll0">
+				<swiper class="swiper" circular :indicator-dots="false" :autoplay="true">
+					<swiper-item v-if="goodinfo.video">
+						<video style="width: 750rpx; height: 750rpx" :src="goodinfo.video"></video>
+					</swiper-item>
+					<template v-if="goodinfo.images">
+						<swiper-item v-for="(item, idx) in goodinfo.images.split(',')" :key="idx">
+							<image :src="goodinfo.image" style="width: 750rpx; height: 750rpx" mode=""></image>
+						</swiper-item>
+					</template>
+				</swiper>
+			</view>
+			<view class="back">
+				<!-- 折扣 -->
+				<view class="discount">
+					<view class="top">
+						<text class="count" v-if="goodinfo.is_discount == 0">{{
               i18n.Discounted
             }}</text>
-            <text class="money">¥</text>
-            <text class="money" style="font-size: 48rpx">{{
+						<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>
-            <text class="money">{{
+						<text class="money">{{
               goodinfo.is_discount == 0
                 ? goodinfo.discount_price.slice(-3)
                 : goodinfo.price.slice(-3)
             }}</text>
-            <text class="right" v-if="goodinfo.is_discount == 0"
-              >¥{{ goodinfo.price }}</text
-            >
-          </view>
-          <view class="bottom">
-            <text class="tabs">{{ i18n.sametype }}</text>
-            <view class="title">
-              <text
-                class="title"
-                selectable
-                @longpress="onLongPress"
-                v-if="language == 'zh-CN'"
-              >
-                {{ goodinfo.name_cn }}
-              </text>
-              <text
-                class="title"
-                selectable
-                @longpress="onLongPress"
-                v-if="language == 'en-US'"
-              >
-                {{ goodinfo.name_en }}
-              </text>
-              <text
-                class="title"
-                selectable
-                @longpress="onLongPress"
-                v-if="language == 'es-ES'"
-              >
-                {{ goodinfo.name_es }}
-              </text>
-              <text
-                class="title"
-                selectable
-                @longpress="onLongPress"
-                v-if="language == 'it-IT'"
-              >
-                {{ goodinfo.name_ita }}
-              </text>
-            </view>
-          </view>
-        </view>
-        <!-- 服务 -->
-        <view class="serve" style="margin-top: 20rpx">
-          <view class="top u-flex u-row-between" @click="sele">
-            <view class="u-flex">
-              <view class="change">{{ i18n.Sele }}</view>
-              <view class="" style="margin-left: 20rpx">
-                {{ selectArr.length > 0 ? selectArr.join(",") : i18n.Sele }}
-              </view>
-            </view>
-            <view class="">
-              <u-icon name="arrow-right" size="16"></u-icon>
-            </view>
-          </view>
-          <view
-            class="top u-flex u-row-between"
-            style="margin-top: 36rpx"
-            @click="serve = true"
-          >
-            <view class="u-flex">
-              <view class="change">{{ i18n.service }}</view>
-              <view class="" style="margin-left: 20rpx"
-                >正品保障 · 极速退款 · 7天无理由退</view
-              >
-            </view>
-            <view class="">
-              <u-icon name="arrow-right" size="16"></u-icon>
-            </view>
-          </view>
-        </view>
-        <!-- 评论 -->
-        <view class="comment" ref="targetPosition" id="scroll1">
-          <view class="u-flex u-row-between">
-            <text class="ping">{{ i18n.review }}</text>
-            <view class="u-flex" @click="tocomment">
-              <text class="strip"
-                >{{ total }}{{ i18n.article + i18n.review }}</text
-              >
-              <u-icon name="arrow-right" size="16"></u-icon>
-            </view>
-          </view>
-          <view class="" v-for="(item, idx) in commentlist" :key="idx">
-            <view class="uesr u-flex u-row-between" style="margin-top: 36rpx">
-              <view class="u-flex">
-                <image
-                  src="../static/images/logo.png"
-                  style="width: 52rpx; height: 52rpx"
-                  mode=""
-                >
-                </image>
-                <text class="name">{{ item.member.nickname }}</text>
-              </view>
-              <text class="strip">{{ item.created_at }}</text>
-            </view>
-            <view class="content">
-              {{ item.content }}
-            </view>
-            <view class="sku" style="margin-top: 16rpx">{{
+						<text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price }}</text>
+					</view>
+					<view class="bottom">
+						<view class="u-flex" style="column-gap:16rpx">
+							<div v-for="(tab,idx) in goodinfo.label_arr" :key="idx">
+								<text v-if="language == 'zh-CN'" class="tabs">{{ tab.name_cn }}</text>
+								<text v-if="language == 'en-US'" class="tabs">{{ tab.name_en }}</text>
+								<text v-if="language == 'es-ES'" class="tabs">{{ tab.name_es }}</text>
+								<text v-if="language == 'it-IT'" class="tabs">{{ tab.name_ita }}</text>
+							</div>
+						</view>
+						<view class="title">
+							<text class="title" v-if="language == 'zh-CN'">
+								{{ goodinfo.name_cn }}
+							</text>
+							<text class="title" selectable @longpress="onLongPress" v-if="language == 'en-US'">
+								{{ goodinfo.name_en }}
+							</text>
+							<text class="title" selectable @longpress="onLongPress" v-if="language == 'es-ES'">
+								{{ goodinfo.name_es }}
+							</text>
+							<text class="title" selectable @longpress="onLongPress" v-if="language == 'it-IT'">
+								{{ goodinfo.name_ita }}
+							</text>
+						</view>
+					</view>
+				</view>
+				<!-- 服务 -->
+				<view class="serve" style="margin-top: 20rpx">
+					<view class="top u-flex u-row-between" @click="sele">
+						<view class="u-flex">
+							<view class="change">{{ i18n.Sele }}</view>
+							<view class="" style="margin-left: 20rpx">
+								{{ selectArr.length > 0 ? selectArr.join(",") : i18n.Sele }}
+							</view>
+						</view>
+						<view class="">
+							<u-icon name="arrow-right" size="16"></u-icon>
+						</view>
+					</view>
+					<view class="top u-flex u-row-between" style="margin-top: 36rpx" @click="serve = true">
+						<view class="u-flex">
+							<view class="change">{{ i18n.service }}</view>
+							<view class="" style="margin-left: 20rpx">正品保障 · 极速退款 · 7天无理由退</view>
+						</view>
+						<view class="">
+							<u-icon name="arrow-right" size="16"></u-icon>
+						</view>
+					</view>
+				</view>
+				<!-- 评论 -->
+				<view class="comment" ref="targetPosition" id="scroll1">
+					<view class="u-flex u-row-between">
+						<text class="ping">{{ i18n.review }}</text>
+						<view class="u-flex" @click="tocomment">
+							<text class="strip">{{ total }}{{ i18n.article + i18n.review }}</text>
+							<u-icon name="arrow-right" size="16"></u-icon>
+						</view>
+					</view>
+					<view class="" v-for="(item, idx) in commentlist" :key="idx">
+						<view class="uesr u-flex u-row-between" style="margin-top: 36rpx">
+							<view class="u-flex">
+								<image src="../static/images/logo.png" style="width: 52rpx; height: 52rpx" mode="">
+								</image>
+								<text class="name">{{ item.member.nickname }}</text>
+							</view>
+							<text class="strip">{{ item.created_at }}</text>
+						</view>
+						<view class="content">
+							{{ item.content }}
+						</view>
+						<view class="sku" style="margin-top: 16rpx">{{
               item.sku_item.item
             }}</view>
-          </view>
-        </view>
-        <!-- 店铺 -->
-        <view class="store u-flex u-row-between">
-          <view class="u-flex">
-            <image
-              :src="goodinfo.merchant.image"
-              style="width: 112rpx; height: 112rpx"
-              mode=""
-            ></image>
-            <view class="" style="margin-left: 20rpx">
-              <view class="title">{{ goodinfo.merchant.merchant_name }}</view>
-              <view class="redback u-flex">
-                <uni-rate
-                  network
-                  allow-half
-                  :readonly="true"
-                  active-color="red"
-                  color="rgba(255, 27, 0, 0.5)"
-                  :size="8"
-                  :value="5"
-                  v-model="rate"
-                />
-                <text style="margin-left: 8rpx">{{ rate }}</text>
-              </view>
-              <view class="" style="margin-top: 20rpx"></view>
-              <view class="u-flex" style="margin-top: 20rpx">
-                <text class="num">{{ i18n.Salesvolume }} 2384w+</text>
-                <view class="line"></view>
-                <!-- 评价总数 -->
-                <text class="num">{{ i18n.Salesvolume }} 2384w+</text>
-              </view>
-            </view>
-          </view>
-          <view class="goshop" @click="goshop">{{ i18n.stroll }}</view>
-        </view>
-        <!-- 推荐 -->
-        <view class="recommend">
-          <view class="title">
-            {{ i18n.Recommended }}
-          </view>
-          <view class="">
-            <swiper
-              style="height: 400rpx"
-              class="swiper"
-              circular
-              :indicator-dots="true"
-              :autoplay="true"
-            >
-              <swiper-item v-for="(parent, index) in swiptlist" :key="index">
-                <view class="u-flex swiper-item u-row-between">
-                  <view
-                    class=""
-                    v-for="(child, idx) in parent"
-                    @click="detail(child.id)"
-                    :key="idx"
-                  >
-                    <image
-                      :src="child.image"
-                      style="width: 214rpx; height: 214rpx"
-                      mode=""
-                    >
-                    </image>
-                    <view
-                      class="u-line-1"
-                      style="
+					</view>
+				</view>
+				<!-- 店铺 -->
+				<view class="store u-flex u-row-between">
+					<view class="u-flex">
+						<image :src="goodinfo.merchant.image" style="width: 112rpx; height: 112rpx" mode=""></image>
+						<view class="" style="margin-left: 20rpx">
+							<view class="title">{{ goodinfo.merchant.merchant_name }}</view>
+							<view class="redback u-flex">
+								<uni-rate network allow-half :readonly="true" active-color="red"
+									color="rgba(255, 27, 0, 0.5)" :size="8" :value="5" v-model="rate" />
+								<text style="margin-left: 8rpx">{{ rate }}</text>
+							</view>
+							<view class="" style="margin-top: 20rpx"></view>
+							<view class="u-flex" style="margin-top: 20rpx">
+								<text class="num">{{ i18n.Salesvolume }} 2384w+</text>
+								<view class="line"></view>
+								<!-- 评价总数 -->
+								<text class="num">{{ i18n.Salesvolume }} 2384w+</text>
+							</view>
+						</view>
+					</view>
+					<view class="goshop" @click="goshop">{{ i18n.stroll }}</view>
+				</view>
+				<!-- 推荐 -->
+				<view class="recommend">
+					<view class="title">
+						{{ i18n.Recommended }}
+					</view>
+					<view class="">
+						<swiper style="height: 400rpx" class="swiper" circular :indicator-dots="true" :autoplay="true">
+							<swiper-item v-for="(parent, index) in swiptlist" :key="index">
+								<view class="u-flex swiper-item u-row-between">
+									<view class="" v-for="(child, idx) in parent" @click="detail(child.id)" :key="idx">
+										<image :src="child.image" style="width: 214rpx; height: 214rpx" mode="">
+										</image>
+										<view class="over" style="
                         width: 214rpx;
                         margin-top: 14rpx;
                         font-style: normal;
                         font-size: 26rpx;
-                      "
-                      v-if="language == 'zh-CN'"
-                    >
-                      {{ child.name_cn }}
-                    </view>
-                    <view
-                      class="u-line-1"
-                      style="
+                      " v-if="language == 'zh-CN'">
+											{{ child.name_cn }}
+										</view>
+										<view class="over" style="
                         width: 214rpx;
                         margin-top: 14rpx;
                         font-style: normal;
                         font-size: 26rpx;
-                      "
-                      v-if="language == 'en-US'"
-                    >
-                      {{ child.name_en }}
-                    </view>
-                    <view
-                      class="u-line-1"
-                      style="
+                      " v-if="language == 'en-US'">
+											{{ child.name_en }}
+										</view>
+										<view class="over" style="
                         width: 214rpx;
                         margin-top: 14rpx;
                         font-style: normal;
                         font-size: 26rpx;
-                      "
-                      v-if="language == 'es-ES'"
-                    >
-                      {{ child.name_es }}
-                    </view>
-                    <view
-                      class="u-line-1"
-                      style="
+                      " v-if="language == 'es-ES'">
+											{{ child.name_es }}
+										</view>
+										<view class="over" style="
                         width: 214rpx;
                         margin-top: 14rpx;
                         font-style: normal;
                         font-size: 26rpx;
-                      "
-                      v-if="language == 'it-IT'"
-                    >
-                      {{ child.name_ita }}
-                    </view>
-                    <view class="" style="margin-top: 12rpx">
-                      <span style="color: rgba(204, 51, 0, 1); font-size: 26rpx"
-                        >¥{{ child.price }}</span
-                      >
-                    </view>
-                  </view>
-                </view>
-              </swiper-item>
-            </swiper>
-          </view>
-        </view>
-        <view class="recommend" id="scroll2">
-          <view class="title">{{ i18n.Productdetails }}</view>
-          <view class="" style="margin-top: 32rpx; margin-bottom: 28rpx">{{
+                      " v-if="language == 'it-IT'">
+											{{ child.name_ita }}
+										</view>
+										<view class="" style="margin-top: 12rpx">
+											<span
+												style="color: rgba(204, 51, 0, 1); font-size: 26rpx">¥{{ child.price }}</span>
+										</view>
+									</view>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+				<view class="recommend" id="scroll2">
+					<view class="title">{{ i18n.Productdetails }}</view>
+					<view class="" style="margin-top: 32rpx; margin-bottom: 28rpx">{{
             i18n.Specification
           }}</view>
-          <view class="specification">
-            <view
-              class="item u-flex"
-              style="margin-bottom: 28rpx"
-              v-for="(item, idx) in goodinfo.parameter"
-              :key="idx"
-            >
-              <view style="width: 150rpx">{{ item.name }}</view>
-              <text style="margin-left: 58rpx">{{ item.value }}</text>
-            </view>
-          </view>
-          <view class="">
-            <image
-              :src="goodinfo.image"
-              style="width: 100%; height: 580rpx"
-              mode=""
-            ></image>
-          </view>
-        </view>
-        <view class="" style="height: 158rpx"></view>
-        <view class="fix u-flex u-row-between">
-          <view class="u-flex" style="column-gap: 35rpx">
-            <view
-              class="u-flex"
-              style="justify-content: center; flex-direction: column"
-            >
-              <image
-                src="../static/images/index/service.png"
-                style="width: 40rpx; height: 40rpx"
-                mode=""
-              >
-              </image>
-              <view class="ke">{{ i18n.Customer }}</view>
-            </view>
-            <view
-              class="u-flex"
-              style="justify-content: center; flex-direction: column"
-              @click="shopping"
-            >
-              <image
-                src="../static/cart1.png"
-                style="width: 40rpx; height: 40rpx"
-                mode=""
-              ></image>
-              <view class="ke">{{ i18n.Shopping }}</view>
-            </view>
-            <view
-              class="u-flex"
-              style="
+					<view class="specification">
+						<view class="item u-flex" style="margin-bottom: 28rpx" v-for="(item, idx) in goodinfo.parameter"
+							:key="idx">
+							<view style="width: 150rpx">{{ item.name }}</view>
+							<text style="margin-left: 58rpx">{{ item.value }}</text>
+						</view>
+					</view>
+					<view class="" style="margin-top: 10rpx;">
+						<u-parse :content="goodinfo.detail_cn"></u-parse>
+						<!-- <image :src="goodinfo.image" style="width: 100%; height: 580rpx" mode=""></image> -->
+					</view>
+				</view>
+				<view class="" style="height: 158rpx"></view>
+				<view class="fix u-flex u-row-between">
+					<view class="u-flex" style="column-gap: 35rpx">
+						<view class="u-flex" style="justify-content: center; flex-direction: column">
+							<image src="../static/images/index/service.png" style="width: 40rpx; height: 40rpx" mode="">
+							</image>
+							<view class="ke">{{ i18n.Customer }}</view>
+						</view>
+						<view class="u-flex" style="justify-content: center; flex-direction: column" @click="shopping">
+							<image src="../static/cart1.png" style="width: 40rpx; height: 40rpx" mode=""></image>
+							<view class="ke">{{ i18n.Shopping }}</view>
+						</view>
+						<view class="u-flex" style="
                 justify-content: center;
                 flex-direction: column;
                 width: 70rpx;
-              "
-              @click="fllow"
-            >
-              <image
-                v-if="goodinfo.is_interest == 1"
-                src="../static/images/index/attention.png"
-                style="width: 40rpx; height: 40rpx"
-                mode=""
-              ></image>
-              <image
-                v-if="goodinfo.is_interest == 0"
-                src="../static/images/index/bottom1.png"
-                style="width: 40rpx; height: 40rpx"
-                mode=""
-              >
-              </image>
-              <view v-if="goodinfo.is_interest == 1" class="ke">{{
+              " @click="fllow">
+							<image v-if="goodinfo.is_interest == 1" src="../static/images/index/attention.png"
+								style="width: 40rpx; height: 40rpx" mode=""></image>
+							<image v-if="goodinfo.is_interest == 0" src="../static/images/index/bottom1.png"
+								style="width: 40rpx; height: 40rpx" mode="">
+							</image>
+							<view v-if="goodinfo.is_interest == 1" class="ke">{{
                 i18n.follow
               }}</view>
-              <view
-                v-if="goodinfo.is_interest == 0"
-                class="ke"
-                style="color: rgba(248, 50, 36, 1)"
-                >已关注
-              </view>
-            </view>
-          </view>
-          <view
-            v-if="sku_info.stock_total == 0"
-            class="tongzhi"
-            @click="inform"
-          >
-            {{ i18n.notification }}
-          </view>
-          <view v-if="sku_info.stock_total != 0" class="join" @click="join(0)"
-            >加入购物车</view
-          >
-          <view v-if="sku_info.stock_total != 0" class="pin" @click="join(1)"
-            >立即拼团</view
-          >
-        </view>
-      </view>
-    </scroll-view>
-    <!-- 加入购物车 -->
-    <u-popup :round="10" :show="show">
-      <view
-        style="padding: 48rpx 28rpx; box-sizing: border-box; position: relative"
-      >
-        <view class="u-flex">
-          <image
-            :src="goodinfo.image"
-            style="width: 192rpx; height: 192rpx"
-            mode=""
-          ></image>
-          <view class="" style="margin-left: 20rpx">
-            <view class="">
-              <text class="read">¥</text>
-              <text
-                class="read"
-                style="font-size: 40rpx"
-                v-if="goodinfo.is_discount == 0"
-                >{{
+							<view v-if="goodinfo.is_interest == 0" class="ke" style="color: rgba(248, 50, 36, 1)">已关注
+							</view>
+						</view>
+					</view>
+					<view v-if="sku_info.stock_total == 0" class="tongzhi" @click="inform">
+						{{ i18n.notification }}
+					</view>
+					<view v-if="sku_info.stock_total != 0" class="join" @click="join(0)">加入购物车</view>
+					<view v-if="sku_info.stock_total != 0" class="pin" @click="join(1)">立即拼团</view>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 加入购物车 -->
+		<u-popup :round="10" :show="show">
+			<view style="padding: 48rpx 28rpx; box-sizing: border-box; position: relative">
+				<view class="u-flex">
+					<image :src="goodinfo.image" style="width: 192rpx; height: 192rpx" mode=""></image>
+					<view class="" style="margin-left: 20rpx">
+						<view class="">
+							<text class="read">¥</text>
+							<text class="read" style="font-size: 40rpx" v-if="goodinfo.is_discount == 0">{{
                   (Number(sku_info.discount_price * 100) *
                     Number(value * 100)) /
                     10000 ||
                   (Number(goodinfo.discount_price * 100) *
                     Number(value * 100)) /
                     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"
-                v-if="goodinfo.is_discount == 1"
-                >{{
+                }}</text>
+							<!-- <text class="read" v-if="goodinfo.is_discount==0">{{(goodinfo.discount_price * value).slice(-3)}}</text> -->
+							<text class="read" style="font-size: 40rpx" 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 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>
-            <text class="guige"
-              >已选：{{ selectArr.join(",") || i18n.selection }}</text
-            >
-          </view>
-        </view>
-        <view
-          class=""
-          style="position: absolute; top: 48rpx; right: 28rpx"
-          @click="show = false"
-        >
-          <u-icon
-            name="close"
-            @click="show == false"
-            color="#000"
-            size="28"
-          ></u-icon>
-        </view>
-        <view class="" v-for="(item, index) in goodinfo.sku">
-          <view class="title1" style="margin-top: 40rpx; margin-bottom: 32rpx">
-            {{ item.name }}
-          </view>
-          <view class="u-flex" style="column-gap: 18rpx; flex-wrap: wrap">
-            <view
-              class=""
-              :class="selectArr[index] == child ? 'acttab' : 'tabs'"
-              v-for="(child, idx) in item.values"
-              :key="idx"
-              @click="actabs(index, child, item)"
-            >
-              {{ child }}
-            </view>
-          </view>
-        </view>
-        <view class="u-flex u-row-between" style="margin-top: 30rpx">
-          <text class="title1">数量</text>
-          <u-number-box v-model="value" @change="valChange"></u-number-box>
-        </view>
-        <view class="" style="height: 200rpx"></view>
-        <view class="bottoma">
-          <view v-if="shopcar == 0" class="btn" @click="joincart">
-            加入购物车
-          </view>
-          <view v-if="shopcar == 1" class="btn" @click="order"> 立即购买 </view>
-          <view v-if="shopcar == 2" class="btn" @click="show = false">
-            确定
-          </view>
-        </view>
-      </view>
-    </u-popup>
-    <u-popup :show="serve" :round="20">
-      <view
-        style="
+                }}</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>
+						<text class="guige">已选：{{ selectArr.join(",") || i18n.selection }}</text>
+					</view>
+				</view>
+				<view class="" style="position: absolute; top: 48rpx; right: 28rpx" @click="close">
+					<u-icon name="close" color="#000" size="28"></u-icon>
+				</view>
+				<view class="" v-for="(item, index) in goodinfo.sku">
+					<view class="title1" style="margin-top: 40rpx; margin-bottom: 32rpx">
+						{{ item.name }}
+					</view>
+					<view class="u-flex" style="column-gap: 18rpx; flex-wrap: wrap">
+						<view class="" :class="selectArr[index] == child ? 'acttab' : 'tabs'"
+							v-for="(child, idx) in item.values" :key="idx" @click="actabs(index, child, item)">
+							{{ child }}
+						</view>
+					</view>
+				</view>
+				<view class="u-flex u-row-between" style="margin-top: 30rpx">
+					<text class="title1">数量</text>
+					<u-number-box v-model="value" @change="valChange"></u-number-box>
+				</view>
+				<view class="" style="height: 200rpx"></view>
+				<view class="bottoma">
+					<view v-if="shopcar == 0" class="btn" @click="joincart">
+						加入购物车
+					</view>
+					<view v-if="shopcar == 1" class="btn" @click="order"> 立即购买 </view>
+					<view v-if="shopcar == 2" class="btn" @click="close">
+						确定
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup :show="serve" :round="20">
+			<view style="
           padding: 48rpx 24rpx;
           box-sizing: border-box;
           background-color: #fff3e7;
           position: relative;
           border-radius: 20rpx 20rpx 0 0;
-        "
-      >
-        <view
-          class="u-flex"
-          style="flex-direction: column; justify-content: center"
-        >
-          <image
-            src="../static/images/index/serve.png"
-            style="width: 138rpx; height: 34rpx"
-            mode=""
-          ></image>
-          <text class="info"> 售前售后 安心无忧购物 </text>
-        </view>
-        <view
-          class=""
-          style="position: absolute; top: 48rpx; right: 24rpx"
-          @click="serve = false"
-        >
-          <u-icon name="close" style="width: 22rpx; height: 22rpx"></u-icon>
-        </view>
-        <view class="contenta">
-          <view class="">
-            <view class="title">丢包丢件</view>
-            <view class="content"
-              >快件如果在运输过程中出现损毁，将按照保价</view
-            >
-          </view>
-          <view class="" style="margin-top: 36rpx">
-            <view class="title">丢包丢件</view>
-            <view class="content"
-              >快件如果在运输过程中出现损毁，将按照保价</view
-            >
-          </view>
-          <view class="" style="margin-top: 36rpx">
-            <view class="title">丢包丢件</view>
-            <view class="content"
-              >快件如果在运输过程中出现损毁，将按照保价</view
-            >
-          </view>
-        </view>
-        <view class="button" @click="serve = false">
-          {{ i18n.know }}
-        </view>
-      </view>
-    </u-popup>
-    <u-popup :round="10" :show="share" bgColor=" rgba(244, 244, 244, 1);">
-      <view
-        style="
+        ">
+				<view class="u-flex" style="flex-direction: column; justify-content: center">
+					<image src="../static/images/index/serve.png" style="width: 138rpx; height: 34rpx" mode=""></image>
+					<text class="info"> 售前售后 安心无忧购物 </text>
+				</view>
+				<view class="" style="position: absolute; top: 48rpx; right: 24rpx" @click="serve = false">
+					<u-icon name="close" style="width: 22rpx; height: 22rpx"></u-icon>
+				</view>
+				<view class="contenta">
+					<view class="">
+						<view class="title">丢包丢件</view>
+						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					</view>
+					<view class="" style="margin-top: 36rpx">
+						<view class="title">丢包丢件</view>
+						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					</view>
+					<view class="" style="margin-top: 36rpx">
+						<view class="title">丢包丢件</view>
+						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					</view>
+				</view>
+				<view class="button" @click="serve = false">
+					{{ i18n.know }}
+				</view>
+			</view>
+		</u-popup>
+		<u-popup :round="10" :show="share" bgColor=" rgba(244, 244, 244, 1);">
+			<view style="
           padding: 48rpx 24rpx;
           box-sizing: border-box;
           background-color: rgba(244, 244, 244, 1);
           border-radius: 10px 10px 0 0;
-        "
-      >
-        <view class="u-flex u-row-between" style="">
-          <view class="" style="width: 28px; height: 28px"></view>
-          <text class="info" style="font-size: 32rpx">
-            {{ i18n.shar }}
-          </text>
-          <image
-            src="../static/images/index/bottom2.png"
-            style="width: 40rpx; height: 40rpx"
-          >
-          </image>
-        </view>
-        <!-- 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
+        ">
+				<view class="u-flex u-row-between" style="">
+					<view class="" style="width: 28px; height: 28px"></view>
+					<text class="info" style="font-size: 32rpx">
+						{{ i18n.shar }}
+					</text>
+					<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 u-row-between"
-          style="margin-top: 82rpx; padding: 0 140rpx"
-        >
-          <view class="">
-            <image
-              src="../static/images/index/link.png"
-              style="width: 108rpx; height: 108rpx"
-              mode=""
-            >
-            </image>
-            <view class="link">{{ i18n.Copylink }}</view>
-          </view>
-          <view class="" @click="builder">
-            <image
-              src="../static/images/index/image.png"
-              style="width: 108rpx; height: 108rpx"
-              mode=""
-            >
-            </image>
-            <view class="link">{{ i18n.Generatepicture }}</view>
-          </view>
-        </view>
-        <view
-          class="button"
-          @click="share = false"
-          style="background: #fff; color: #555555; margin-top: 58rpx"
-        >
-          {{ i18n.Cancel }}
-        </view>
-      </view>
-    </u-popup>
-    <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>
-      </view>
-      <view
-        style="
+				<view class="u-flex u-row-between" style="margin-top: 82rpx; padding: 0 140rpx">
+					<view class="">
+						<image src="../static/images/index/link.png" style="width: 108rpx; height: 108rpx" mode="">
+						</image>
+						<view class="link">{{ i18n.Copylink }}</view>
+					</view>
+					<view class="" @click="builder">
+						<image src="../static/images/index/image.png" style="width: 108rpx; height: 108rpx" mode="">
+						</image>
+						<view class="link">{{ i18n.Generatepicture }}</view>
+					</view>
+				</view>
+				<view class="button" @click="close" style="background: #fff; color: #555555; margin-top: 58rpx">
+					{{ i18n.Cancel }}
+				</view>
+			</view>
+		</u-popup>
+		<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>
+			</view>
+			<view style="
           padding: 48rpx 24rpx;
           box-sizing: border-box;
           background-color: rgba(255, 255, 255, 1);
           border-radius: 16rpx;
           width: 538rpx;
-        "
-      >
-        <view class="" style="">
-          <image
-            src="../static/images/index/bottom2.png"
-            style="width: 490rpx; height: 490rpx"
-          ></image>
-        </view>
-        <view class="money">
-          <span>¥</span>
-          <span style="font-size: 36rpx">258</span>
-          <span>00</span>
-        </view>
-        <view class="title">布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼</view>
-        <view
-          class=""
-          style="
+        ">
+				<view class="" style="">
+					<image src="../static/images/index/bottom2.png" style="width: 490rpx; height: 490rpx"></image>
+				</view>
+				<view class="money">
+					<span>¥</span>
+					<span style="font-size: 36rpx">258</span>
+					<span>00</span>
+				</view>
+				<view class="title">布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼</view>
+				<view class="" style="
             display: flex;
             flex-direction: column;
             align-items: center;
             justify-content: center;
             margin-top: 44rpx;
-          "
-        >
-          <image
-            src="../static/images/logo.png"
-            style="width: 132rpx; height: 132rpx"
-            mode=""
-          ></image>
-          <view class="view">长按识别查看</view>
-        </view>
-      </view>
-      <view class="button" style="width: 658rpx">保存到相册</view>
-    </u-popup>
-  </view>
+          ">
+					<image src="../static/images/logo.png" style="width: 132rpx; height: 132rpx" mode=""></image>
+					<view class="view">长按识别查看</view>
+				</view>
+			</view>
+			<view class="button" style="width: 658rpx">保存到相册</view>
+		</u-popup>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      toView: "",
-      imagea: false,
-      list1: [
-        {
-          name: "商品",
-        },
-        {
-          name: "评价",
-        },
-        {
-          name: "详情",
-        },
-      ],
-      current: 0,
-      // 购物车
-      show: false,
-      //服务
-      serve: false,
-      //分享
-      share: false,
-      value: 1, //步进器的值
-      swiptlist: [], //推荐列表
-      actab: 0,
-      id: "", //商品id
-      language: "",
-      goodinfo: {}, //商品详情
-      duration: 0, //tabs选项
-      actidx: 0,
-      subIndex: [],
-      selectArr: [],
-      shopcar: "",
-      sku_info: {},
-      commentlist: [],
-      total: "",
-      rate: 5,
-    };
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  onLoad(options) {
-    this.id = options.id;
-    this.comment();
-  },
-  onShow() {
-    if (uni.getStorageSync("language") != "") {
-      this.language = uni.getStorageSync("language");
-    }
-    this.detail(this.id);
-    this.recommend();
-  },
-  methods: {
-    //评论页面
-    tocomment() {
-      uni.navigateTo({
-        url: "/pageA/comment?id=" + this.goodinfo.merchant_goods_id,
-      });
-    },
-    //关注
-    fllow() {
-      uni.$u.http
-        .post("/api/interest/follow", {
-          interest_type: 0,
-          interest_id: this.goodinfo.merchant_goods_id,
-        })
-        .then((res) => {
-          if (res == "ok1") {
-            this.$u.toast("取关成功");
-            this.detail(this.id);
-          } else {
-            this.$u.toast("关注成功");
-            this.detail(this.id);
-          }
-        })
-        .catch(() => {});
-    },
-    sele() {
-      this.shopcar = 2;
-      this.show = true;
-    },
-    //跳转到购物车
-    shopping() {
-      uni.switchTab({
-        url: "/pages/cart/cart",
-      });
-    },
-    //评论接口
-    comment() {
-      uni.$u.http
-        .post("/api/goods/goods_comment", {
-          merchant_goods_id: this.goodinfo.merchant_goods_id,
-          page: 1,
-          limit: 2,
-        })
-        .then((res) => {
-          this.commentlist = res.data;
-          this.total = res.total;
-        })
-        .catch(() => {});
-    },
-    //商品推荐
-    recommend() {
-      uni.$u.http
-        .post("/api/goods/recommend", {
-          keyword: "",
-        })
-        .then((res) => {
-          this.swiptlist = res.reduce(
-            (a, b) => {
-              let lastIndex = a.length - 1;
-              if (a[lastIndex].length < 3) {
-                a[lastIndex].push(b);
-              } else {
-                a.push([b]);
-              }
-              return a;
-            },
-            [[]]
-          );
-        })
-        .catch(() => {});
-    },
-    scrollToPosition(e) {
-      console.log(e);
-      this.current = e.index;
-      setTimeout(() => {
-        this.toView = "scroll" + e.index;
-      }, 200);
-    },
-    //逛逛
-    goshop() {
-      uni.navigateTo({
-        url: "/pageD/homepage/homepage",
-      });
-    },
-    detail(id) {
-      uni.$u.http
-        .get("/api/goods/detail/" + id)
-        .then((res) => {
-          console.log(res);
-          this.goodinfo = res;
-          this.comment();
-          this.rate = res.merchant.score;
-        })
-        .catch(() => {});
-    },
-    // scrollToPosition() {
-    // 	console.log(111);
-    // 	// 使用$refs获取目标位置的DOM元素
-    // 	const targetElement = this.$refs.targetPosition;
-    // 	// 调用scrollToView方法滚动到目标位置
-    // 	this.$refs.scrollView.scrollToView('targetPosition');
-    // },
-    actabs(index, child, idx) {
-      // this.actidx = index
-      // this.actab = child
-      console.log(this.selectArr);
-      if (this.selectArr[index] != child) {
-        this.$set(this.selectArr, index, child);
-        this.$set(this.subIndex, index, idx);
-      } else {
-        this.$set(this.selectArr, index, "");
-        this.$set(this.subIndex, index, -1); //去掉选中颜色
-      }
-      this.goodinfo.sku_item.forEach((ite) => {
-        console.log(ite.item);
-        console.log(this.selectArr.join(","));
-        if (ite.item == this.selectArr.join(",")) {
-          this.sku_info = ite;
-        }
-      });
-      console.log(this.sku_info);
-    },
-    order() {
-      if (this.sku_info.stock_total != 0) {
-        uni.navigateTo({
-          url:
-            "/pageA/order?sku=" +
-            encodeURIComponent(JSON.stringify(this.sku_info)) +
-            "&value=" +
-            this.value +
-            "&goodinfo=" +
-            encodeURIComponent(JSON.stringify(this.goodinfo)),
-        });
-      } else {
-        this.$u.toast("库存为0");
-        this.show = false;
-      }
-      // console.log(JSON.stringify(this.sku_info));
-    },
-    //生成图片弹窗
-    builder() {
-      this.imagea = true;
-      this.share = false;
-    },
-    //加入购物车
-    joincart() {
-      this.show = false;
-      if (this.sku_info.stock_total == 0) {
-        this.$u.toast("添加失败,库存为0");
-      } else {
-        uni.$u.http
-          .post("/api/cart/save", {
-            goods_id: this.id, //63 是 String 商品id
-            goods_num: this.value, //1 是 String 商品数量
-            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
-          })
-          .then((res) => {
-            this.$u.toast("添加成功");
-          })
-          .catch(() => {});
-      }
-    },
-    valChange(e) {
-      return e.value;
-    },
-    navigateBack() {
-      uni.navigateBack();
-    },
-    join(index) {
-      this.show = true;
-      this.shopcar = index;
-    },
-    //通知
-    inform() {
-      uni.showToast({
-        title: this.i18n.shelves,
-        icon: "none",
-        duration: 2000,
-      });
-    },
-    //复制
-    onLongPress(e) {
-      // 获取长按的文本内容
-      let text = e.target.innerText;
-      console.log(e);
-      // 执行复制操作
-      uni.setClipboardData({
-        data: text,
-        success: () => {
-          uni.showToast({
-            title: this.i18n.Copiedpaste,
-            duration: 2000,
-          });
-        },
-        fail: () => {
-          uni.showToast({
-            title: this.i18n.Replicationfailure,
-            icon: "none",
-            duration: 2000,
-          });
-        },
-      });
-    },
-  },
-};
+	export default {
+		data() {
+			return {
+				toView: "",
+				imagea: false,
+				list1: [{
+						name: "商品",
+					},
+					{
+						name: "评价",
+					},
+					{
+						name: "详情",
+					},
+				],
+				current: 0,
+				// 购物车
+				show: false,
+				//服务
+				serve: false,
+				//分享
+				share: false,
+				value: 1, //步进器的值
+				swiptlist: [], //推荐列表
+				actab: 0,
+				id: "", //商品id
+				language: "zh-CN",
+				goodinfo: {}, //商品详情
+				duration: 0, //tabs选项
+				actidx: 0,
+				subIndex: [],
+				selectArr: [],
+				shopcar: "",
+				sku_info: {},
+				commentlist: [],
+				total: "",
+				rate: 5,
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		onLoad(options) {
+			this.id = options.id;
+			this.comment();
+		},
+		onShow() {
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
+			this.detail(this.id);
+			this.recommend();
+		},
+		methods: {
+			sharea() {
+				this.share = true
+			},
+			close() {
+				this.show = false
+				this.share = false
+			},
+			//评论页面
+			tocomment() {
+				uni.navigateTo({
+					url: "/pageA/comment?id=" + this.goodinfo.merchant_goods_id,
+				});
+			},
+			//关注
+			fllow() {
+				uni.$u.http
+					.post("/api/interest/follow", {
+						interest_type: 0,
+						interest_id: this.goodinfo.merchant_goods_id,
+					})
+					.then((res) => {
+						if (res == "ok1") {
+							this.$u.toast("取关成功");
+							this.detail(this.id);
+						} else {
+							this.$u.toast("关注成功");
+							this.detail(this.id);
+						}
+					})
+					.catch(() => {});
+			},
+			sele() {
+				this.shopcar = 2;
+				this.show = true;
+			},
+			//跳转到购物车
+			shopping() {
+				uni.switchTab({
+					url: "/pages/cart/cart",
+				});
+			},
+			//评论接口
+			comment() {
+				uni.$u.http
+					.post("/api/goods/goods_comment", {
+						merchant_goods_id: this.goodinfo.merchant_goods_id,
+						page: 1,
+						limit: 2,
+					})
+					.then((res) => {
+						this.commentlist = res.data;
+						this.total = res.total;
+					})
+					.catch(() => {});
+			},
+			//商品推荐
+			recommend() {
+				uni.$u.http
+					.post("/api/goods/recommend", {
+						keyword: "",
+					})
+					.then((res) => {
+						this.swiptlist = res.reduce(
+							(a, b) => {
+								let lastIndex = a.length - 1;
+								if (a[lastIndex].length < 3) {
+									a[lastIndex].push(b);
+								} else {
+									a.push([b]);
+								}
+								return a;
+							},
+							[
+								[]
+							]
+						);
+					})
+					.catch(() => {});
+			},
+			scrollToPosition(e) {
+				console.log(e);
+				this.current = e.index;
+				setTimeout(() => {
+					this.toView = "scroll" + e.index;
+				}, 200);
+			},
+			//逛逛
+			goshop() {
+				uni.navigateTo({
+					url: "/pageD/homepage/homepage",
+				});
+			},
+			detail(id) {
+				uni.$u.http
+					.get("/api/goods/detail/" + id)
+					.then((res) => {
+						console.log(res);
+						this.goodinfo = res;
+						this.comment();
+						this.rate = res.merchant.score;
+					})
+					.catch(() => {});
+			},
+			// scrollToPosition() {
+			// 	console.log(111);
+			// 	// 使用$refs获取目标位置的DOM元素
+			// 	const targetElement = this.$refs.targetPosition;
+			// 	// 调用scrollToView方法滚动到目标位置
+			// 	this.$refs.scrollView.scrollToView('targetPosition');
+			// },
+			actabs(index, child, idx) {
+				// this.actidx = index
+				// this.actab = child
+				console.log(this.selectArr);
+				if (this.selectArr[index] != child) {
+					this.$set(this.selectArr, index, child);
+					this.$set(this.subIndex, index, idx);
+				} else {
+					this.$set(this.selectArr, index, "");
+					this.$set(this.subIndex, index, -1); //去掉选中颜色
+				}
+				this.goodinfo.sku_item.forEach((ite) => {
+					console.log(ite.item);
+					console.log(this.selectArr.join(","));
+					if (ite.item == this.selectArr.join(",")) {
+						this.sku_info = ite;
+					}
+				});
+				console.log(this.sku_info);
+			},
+			order() {
+				if (this.sku_info.stock_total != 0) {
+					uni.navigateTo({
+						url: "/pageA/order?sku=" +
+							encodeURIComponent(JSON.stringify(this.sku_info)) +
+							"&value=" +
+							this.value +
+							"&goodinfo=" +
+							encodeURIComponent(JSON.stringify(this.goodinfo)),
+					});
+				} else {
+					this.$u.toast("库存为0");
+					this.show = false;
+				}
+				// console.log(JSON.stringify(this.sku_info));
+			},
+			//生成图片弹窗
+			builder() {
+				this.imagea = true;
+				this.share = false;
+			},
+			//加入购物车
+			joincart() {
+				this.show = false;
+				if (this.sku_info.stock_total == 0) {
+					this.$u.toast("添加失败,库存为0");
+				} else {
+					uni.$u.http
+						.post("/api/cart/save", {
+							goods_id: this.id, //63 是 String 商品id
+							goods_num: this.value, //1 是 String 商品数量
+							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
+						})
+						.then((res) => {
+							this.$u.toast("添加成功");
+						})
+						.catch(() => {});
+				}
+			},
+			valChange(e) {
+				return e.value;
+			},
+			navigateBack() {
+				uni.navigateBack();
+			},
+			join(index) {
+				this.show = true;
+				this.shopcar = index;
+			},
+			//通知
+			inform() {
+				uni.showToast({
+					title: this.i18n.shelves,
+					icon: "none",
+					duration: 2000,
+				});
+			},
+			//复制
+			onLongPress(e) {
+				// 获取长按的文本内容
+				let text = e.target.innerText;
+				console.log(e);
+				// 执行复制操作
+				uni.setClipboardData({
+					data: text,
+					success: () => {
+						uni.showToast({
+							title: this.i18n.Copiedpaste,
+							duration: 2000,
+						});
+					},
+					fail: () => {
+						uni.showToast({
+							title: this.i18n.Replicationfailure,
+							icon: "none",
+							duration: 2000,
+						});
+					},
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.redback {
-  background: rgba(255, 27, 0, 0.07);
-  border-radius: 12rpx;
-  padding: 6rpx 12rpx;
-  box-sizing: border-box;
-  font-family: HarmonyOS_Sans_Medium;
-  font-size: 16rpx;
-  color: #ff1515;
-  line-height: 22rpx;
-  text-align: left;
-  font-style: normal;
-  width: 200rpx;
-}
+	.over {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		-webkit-line-clamp: 2;
+		height: 70rpx;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+	}
 
-.sku {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #888888;
-  line-height: 28rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.redback {
+		background: rgba(255, 27, 0, 0.07);
+		border-radius: 12rpx;
+		padding: 6rpx 12rpx;
+		box-sizing: border-box;
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 16rpx;
+		color: #ff1515;
+		line-height: 22rpx;
+		text-align: left;
+		font-style: normal;
+		width: 150rpx;
+	}
 
-.acttab {
-  height: 68rpx;
-  padding: 14rpx 30rpx;
-  text-align: center;
-  box-sizing: border-box;
-  display: inline;
-  background: rgba(248, 50, 36, 0.06);
-  border-radius: 6rpx;
-  border: 2rpx solid #f83224;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #f83224;
-  line-height: 40rpx;
-}
+	.sku {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #888888;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.read {
-  font-family: HarmonyOS_Sans_Medium;
-  font-size: 26rpx;
-  color: #f83224;
-  line-height: 36rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.acttab {
+		height: 68rpx;
+		padding: 14rpx 30rpx;
+		text-align: center;
+		box-sizing: border-box;
+		display: inline;
+		background: rgba(248, 50, 36, 0.06);
+		border-radius: 6rpx;
+		border: 2rpx solid #f83224;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #f83224;
+		line-height: 40rpx;
+	}
 
-// ::v-deep .u-popup__content{
-// 	background-color: rgba(0,0,0,0) !important;
-// }
-.money {
-  font-family: HarmonyOS_Sans_Medium;
-  font-size: 20rpx;
-  color: #f83224;
-  line-height: 26rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.read {
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 26rpx;
+		color: #f83224;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.title {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #222222;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  margin-top: 16rpx;
-}
+	// ::v-deep .u-popup__content{
+	// 	background-color: rgba(0,0,0,0) !important;
+	// }
+	.money {
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 20rpx;
+		color: #f83224;
+		line-height: 26rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.view {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #777777;
-  line-height: 28rpx;
-  text-align: left;
-  font-style: normal;
-  margin-top: 12rpx;
-}
+	.title {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 16rpx;
+	}
 
-.actabs {
-  width: 116rpx;
-  height: 68rpx;
-  background: rgba(248, 50, 36, 0.06);
-  border-radius: 6rpx;
-  border: 2rpx solid #f83224;
-}
+	.view {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 12rpx;
+	}
 
-.bottoma {
-  width: 750rpx;
-  height: 166rpx;
-  background: #ffffff;
-  padding: 16rpx 44rpx 0;
-  position: fixed;
-  bottom: 0;
-  left: 0;
+	.actabs {
+		width: 116rpx;
+		height: 68rpx;
+		background: rgba(248, 50, 36, 0.06);
+		border-radius: 6rpx;
+		border: 2rpx solid #f83224;
+	}
 
-  .btn {
-    width: 662rpx;
-    height: 84rpx;
-    background: #f83224;
-    border-radius: 44rpx;
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 500;
-    font-size: 32rpx;
-    color: #ffffff;
-    line-height: 84rpx;
-    text-align: center;
-    font-style: normal;
-  }
-}
+	.bottoma {
+		width: 750rpx;
+		height: 166rpx;
+		background: #ffffff;
+		padding: 16rpx 44rpx 0;
+		position: fixed;
+		bottom: 0;
+		left: 0;
 
-.title1 {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 550;
-  font-size: 32rpx;
-  color: #222222;
-  line-height: 44rpx;
-  text-align: left;
-  font-style: normal;
-}
+		.btn {
+			width: 662rpx;
+			height: 84rpx;
+			background: #f83224;
+			border-radius: 44rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #ffffff;
+			line-height: 84rpx;
+			text-align: center;
+			font-style: normal;
+		}
+	}
 
-.tabs {
-  // width: 276rpx;
-  height: 68rpx;
-  padding: 14rpx 30rpx;
-  text-align: center;
-  background: #f4f4f4;
-  border-radius: 6rpx;
-  box-sizing: border-box;
-  display: inline;
-  font-size: 28rpx;
-  border: 2rpx solid rgba(151, 151, 151, 0);
-  line-height: 40rpx;
-  // line-height: 68rpx;
-}
+	.title1 {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 550;
+		font-size: 32rpx;
+		color: #222222;
+		line-height: 44rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.link {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #555555;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  margin-top: 16rpx;
-}
+	.tabs {
+		// width: 276rpx;
+		height: 68rpx;
+		padding: 14rpx 30rpx;
+		text-align: center;
+		background: #f4f4f4;
+		border-radius: 6rpx;
+		box-sizing: border-box;
+		display: inline;
+		font-size: 28rpx;
+		border: 2rpx solid rgba(151, 151, 151, 0);
+		line-height: 40rpx;
+		// line-height: 68rpx;
+	}
 
-.tongzhi {
-  width: 422rpx;
-  height: 76rpx;
-  background: #ffb515;
-  border-radius: 40rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #ffffff;
-  line-height: 76rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.link {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #555555;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 16rpx;
+	}
 
-.info {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #222222;
-  line-height: 28rpx;
-  text-align: left;
-  font-style: normal;
-  margin-top: 18rpx;
-}
+	.tongzhi {
+		width: 422rpx;
+		height: 76rpx;
+		background: #ffb515;
+		border-radius: 40rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #ffffff;
+		line-height: 76rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.button {
-  // width: 662rpx;
-  height: 88rpx;
-  background: #f83224;
-  border-radius: 44rpx;
-  margin-top: 24rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #ffffff;
-  line-height: 88rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.info {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #222222;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 18rpx;
+	}
 
-.contenta {
-  width: 702rpx;
-  // height: 590rpx;
-  background: #ffffff;
-  border-radius: 20rpx;
-  margin-top: 26rpx;
-  padding: 28rpx 24rpx;
-  box-sizing: border-box;
+	.button {
+		// width: 662rpx;
+		height: 88rpx;
+		background: #f83224;
+		border-radius: 44rpx;
+		margin-top: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #ffffff;
+		line-height: 88rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-  .title {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 500;
-    font-size: 30rpx;
-    color: #222222;
-    line-height: 42rpx;
-    text-align: left;
-    font-style: normal;
-  }
+	.contenta {
+		width: 702rpx;
+		// height: 590rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+		margin-top: 26rpx;
+		padding: 28rpx 24rpx;
+		box-sizing: border-box;
 
-  .content {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 26rpx;
-    color: rgba(34, 34, 34, 0.5);
-    line-height: 36rpx;
-    text-align: left;
-    font-style: normal;
-    margin-top: 20rpx;
-  }
-}
+		.title {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 30rpx;
+			color: #222222;
+			line-height: 42rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-.back {
-  background-color: #f4f4f4;
-  padding: 20rpx;
-  box-sizing: border-box;
+		.content {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 26rpx;
+			color: rgba(34, 34, 34, 0.5);
+			line-height: 36rpx;
+			text-align: left;
+			font-style: normal;
+			margin-top: 20rpx;
+		}
+	}
 
-  .guige {
-  }
+	.back {
+		background-color: #f4f4f4;
+		padding: 20rpx;
+		box-sizing: border-box;
 
-  .fix {
-    width: 750rpx;
-    height: 158rpx;
-    background: #ffffff;
-    padding: 14rpx 28rpx;
-    box-sizing: border-box;
-    position: fixed;
-    bottom: 0;
-    left: 0;
+		.guige {}
 
-    .ke {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #333333;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-    }
+		.fix {
+			width: 750rpx;
+			height: 158rpx;
+			background: #ffffff;
+			padding: 14rpx 28rpx;
+			box-sizing: border-box;
+			position: fixed;
+			bottom: 0;
+			left: 0;
 
-    .join {
-      width: 208rpx;
-      height: 76rpx;
-      border-radius: 40rpx;
-      border: 1rpx solid #ff1515;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #f83224;
-      line-height: 76rpx;
-      text-align: left;
-      font-style: normal;
-      text-align: center;
-    }
+			.ke {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #333333;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .pin {
-      width: 208rpx;
-      height: 76rpx;
-      background: #f83224;
-      border-radius: 40rpx;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #ffffff;
-      line-height: 76rpx;
-      text-align: center;
-      font-style: normal;
-    }
-  }
+			.join {
+				width: 208rpx;
+				height: 76rpx;
+				border-radius: 40rpx;
+				border: 1rpx solid #ff1515;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #f83224;
+				line-height: 76rpx;
+				text-align: left;
+				font-style: normal;
+				text-align: center;
+			}
 
-  // 规格
-  .specification {
-    width: 670rpx;
-    // height: 280rpx;
-    background: #f4f4f4;
-    padding: 24rpx 22rpx;
-    box-sizing: border-box;
+			.pin {
+				width: 208rpx;
+				height: 76rpx;
+				background: #f83224;
+				border-radius: 40rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #ffffff;
+				line-height: 76rpx;
+				text-align: center;
+				font-style: normal;
+			}
+		}
 
-    view:last-of-type {
-      margin-bottom: 0rpx !important;
-    }
+		// 规格
+		.specification {
+			width: 670rpx;
+			// height: 280rpx;
+			background: #f4f4f4;
+			padding: 24rpx 22rpx;
+			box-sizing: border-box;
 
-    .item {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 26rpx;
-      color: #333333;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-    }
-  }
+			view:last-of-type {
+				margin-bottom: 0rpx !important;
+			}
 
-  // 推荐
-  .recommend {
-    width: 710rpx;
-    // height: 476rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 24rpx 20rpx;
-    margin-top: 20rpx;
-    box-sizing: border-box;
+			.item {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #333333;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
 
-    .title {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 550;
-      font-size: 28rpx;
-      color: #222222;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-    }
-  }
+		// 推荐
+		.recommend {
+			width: 710rpx;
+			// height: 476rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 24rpx 20rpx;
+			margin-top: 20rpx;
+			box-sizing: border-box;
 
-  //店铺
-  .store {
-    width: 710rpx;
-    height: 160rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 24rpx 20rpx;
-    box-sizing: border-box;
-    margin-top: 20rpx;
+			.title {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 550;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
 
-    .line {
-      background: rgba(151, 151, 151, 1);
-      width: 4rpx;
-      height: 20rpx;
-      margin: 0 18rpx;
-    }
+		//店铺
+		.store {
+			width: 710rpx;
+			height: 160rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 24rpx 20rpx;
+			box-sizing: border-box;
+			margin-top: 20rpx;
 
-    .num {
-      font-family: SFPro, SFPro;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #777777;
-      line-height: 24rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.line {
+				background: rgba(151, 151, 151, 1);
+				width: 4rpx;
+				height: 20rpx;
+				margin: 0 18rpx;
+			}
 
-    .goshop {
-      // width: 108rpx;
-      height: 52rpx;
-      border-radius: 26rpx;
-      border: 1rpx solid #ff1515;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #f83224;
-      line-height: 52rpx;
-      text-align: center;
-      font-style: normal;
-      padding: 0 20rpx;
-      box-sizing: border-box;
-    }
-  }
+			.num {
+				font-family: SFPro, SFPro;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #777777;
+				line-height: 24rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-  // 评论
-  .comment {
-    width: 710rpx;
-    // height: 356rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    margin-top: 20rpx;
-    padding: 24rpx 20rpx;
-    box-sizing: border-box;
+			.goshop {
+				// width: 108rpx;
+				height: 52rpx;
+				border-radius: 26rpx;
+				border: 1rpx solid #ff1515;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #f83224;
+				line-height: 52rpx;
+				text-align: center;
+				font-style: normal;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+			}
+		}
 
-    .content {
-      margin-top: 20rpx;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 26rpx;
-      color: #444444;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-      max-height: 112rpx;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: wrap;
-      -webkit-line-clamp: 3;
-    }
+		// 评论
+		.comment {
+			width: 710rpx;
+			// height: 356rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+			padding: 24rpx 20rpx;
+			box-sizing: border-box;
 
-    .name {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #222222;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-      margin-left: 16rpx;
-    }
+			.content {
+				margin-top: 20rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #444444;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+				max-height: 112rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: wrap;
+				-webkit-line-clamp: 3;
+			}
 
-    .ping {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #222222;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.name {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #222222;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 16rpx;
+			}
 
-    .strip {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #444444;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-    }
-  }
+			.ping {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-  //服务
-  .serve {
-    width: 710rpx;
-    height: 180rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 32rpx 20rpx;
-    box-sizing: border-box;
+			.strip {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #444444;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
 
-    .top {
-      .change {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #666666;
-        line-height: 40rpx;
-        text-align: left;
-        font-style: normal;
-      }
-    }
-  }
+		//服务
+		.serve {
+			width: 710rpx;
+			height: 180rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 32rpx 20rpx;
+			box-sizing: border-box;
 
-  //折扣
-  .discount {
-    position: relative;
-    height: 312rpx;
+			.top {
+				.change {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #666666;
+					line-height: 40rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+		}
 
-    .top {
-      width: 710rpx;
-      height: 124rpx;
-      background: linear-gradient(295deg, #fb6662 0%, #fd403b 100%);
-      border-radius: 16rpx 16rpx 0 0;
-      padding: 20rpx;
-      box-sizing: border-box;
-      line-height: 98rpx;
+		//折扣
+		.discount {
+			position: relative;
+			height: 312rpx;
 
-      .count {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 400;
-        font-size: 20rpx;
-        color: #ffffff;
-        text-align: left;
-        font-style: normal;
-      }
+			.top {
+				width: 710rpx;
+				height: 124rpx;
+				background: linear-gradient(295deg, #fb6662 0%, #fd403b 100%);
+				border-radius: 16rpx 16rpx 0 0;
+				padding: 20rpx;
+				box-sizing: border-box;
+				line-height: 98rpx;
 
-      .money {
-        font-size: 20rpx;
-        font-family: HarmonyOS_Sans_Medium;
-        font-size: 20rpx;
-        color: #ffffff;
-        text-align: left;
-        font-style: normal;
-        margin-left: 8rpx;
-      }
+				.count {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 20rpx;
+					color: #ffffff;
+					text-align: left;
+					font-style: normal;
+				}
 
-      .right {
-        font-family: HarmonyOS_Sans;
-        font-size: 24rpx;
-        color: #ffffff;
-        text-align: left;
-        font-style: normal;
-        text-decoration-line: line-through;
-        margin-left: 16rpx;
-      }
-    }
+				.money {
+					font-size: 20rpx;
+					font-family: HarmonyOS_Sans_Medium;
+					font-size: 20rpx;
+					color: #ffffff;
+					text-align: left;
+					font-style: normal;
+					margin-left: 8rpx;
+				}
 
-    .bottom {
-      width: 710rpx;
-      height: 208rpx;
-      background: #ffffff;
-      border-radius: 16rpx;
-      position: absolute;
-      top: 104rpx;
-      z-index: 2;
-      padding: 28rpx 20rpx;
-      box-sizing: border-box;
+				.right {
+					font-family: HarmonyOS_Sans;
+					font-size: 24rpx;
+					color: #ffffff;
+					text-align: left;
+					font-style: normal;
+					text-decoration-line: line-through;
+					margin-left: 16rpx;
+				}
+			}
 
-      .title {
-        margin-top: 24rpx;
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 550;
-        font-size: 32rpx;
-        color: #222222;
-        line-height: 44rpx;
-        text-align: left;
-        font-style: normal;
-      }
-    }
+			.bottom {
+				width: 710rpx;
+				height: 208rpx;
+				background: #ffffff;
+				border-radius: 16rpx;
+				position: absolute;
+				top: 104rpx;
+				z-index: 2;
+				padding: 28rpx 20rpx;
+				box-sizing: border-box;
 
-    .tabs {
-      // width: 104rpx;
-      height: 40rpx;
-      background: rgba(255, 21, 21, 0.1);
-      border-radius: 4rpx;
-      padding: 4rpx 8rpx;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 22rpx;
-      color: #ff1515;
-      line-height: 40rpx;
-      text-align: center;
-      font-style: normal;
-    }
-  }
-}
+				.title {
+					margin-top: 24rpx;
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 550;
+					font-size: 32rpx;
+					color: #222222;
+					line-height: 44rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
 
-// 轮播图
-.uni-margin-wrap {
-  width: 750rpx;
-  width: 100%;
+			.tabs {
+				// width: 104rpx;
+				height: 40rpx;
+				background: rgba(255, 21, 21, 0.1);
+				border-radius: 4rpx;
+				padding: 4rpx 8rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 22rpx;
+				color: #ff1515;
+				line-height: 40rpx;
+				text-align: center;
+				font-style: normal;
+			}
+		}
+	}
 
-  .swiper {
-    height: 750rpx;
-  }
+	// 轮播图
+	.uni-margin-wrap {
+		width: 750rpx;
+		width: 100%;
 
-  .swiper-item {
-    display: block;
-    height: 300rpx;
-    line-height: 300rpx;
-    text-align: center;
-  }
+		.swiper {
+			height: 750rpx;
+		}
 
-  .swiper-list {
-    margin-top: 40rpx;
-    margin-bottom: 0;
-  }
+		.swiper-item {
+			display: block;
+			height: 300rpx;
+			line-height: 300rpx;
+			text-align: center;
+		}
 
-  .uni-common-mt {
-    margin-top: 60rpx;
-    position: relative;
-  }
+		.swiper-list {
+			margin-top: 40rpx;
+			margin-bottom: 0;
+		}
 
-  .info {
-    position: absolute;
-    right: 20rpx;
-  }
+		.uni-common-mt {
+			margin-top: 60rpx;
+			position: relative;
+		}
 
-  .uni-padding-wrap {
-    width: 550rpx;
-    padding: 0 100rpx;
-  }
-}
+		.info {
+			position: absolute;
+			right: 20rpx;
+		}
 
-::v-deep .u-popup__content data-v-17becaea {
-  align-items: center !important;
-}
-</style>
+		.uni-padding-wrap {
+			width: 550rpx;
+			padding: 0 100rpx;
+		}
+	}
+
+	::v-deep .u-popup__content data-v-17becaea {
+		align-items: center !important;
+	}
+</style>

pageA/subsidy.vue

@@ -108,7 +108,7 @@
 				show: 1,
 				list: [], //数据
 				Pleaseproductname: '', //搜索内容
-				language: '', //语言
+				language: 'zh-CN', //语言
 			};
 		},
 		computed: {
@@ -192,6 +192,7 @@
 						this.list1[0].name = '精选'
 					}
 					this.list1 = this.list1.concat(categoryArr)
+					console.log(this.list1);
 				}).catch(() => {
 
 				})

pageB/ParcelExpress.vue

@@ -14,23 +14,23 @@
 			</u-navbar>
 			<view class="entrepot">
 				<view class="entre u-flex u-row-between">
-					<text class="title">普通包裹｜海运散货</text>
+					<text class="title">{{expressinfo.type_name}}｜{{expressinfo.transportType.name}}</text>
 					<view class="change">{{i18n.switch}}</view>
 				</view>
 				<view class="box u-row-around u-flex">
 					<view class="flexc">
-						<view class="entrepotname">东莞仓库</view>
+						<view class="entrepotname">{{expressinfo.transit_full_address.slice(0,6)}}</view>
 						<view class="adda">{{i18n.Starting}}</view>
 					</view>
 					<image src="/pageB/static/images/arrows.png" style="width: 130rpx;height: 10rpx;" mode=""></image>
 					<view class="flexc">
-						<view class="entrepotname">澳大利亚</view>
+						<view class="entrepotname">{{expressinfo.containerBase.country_name}}</view>
 						<view class="adda">{{i18n.destination}}</view>
 					</view>
 				</view>
 				<view class="timea">
-					<text>{{i18n.start}}：2023-12-31</text>
-					<text>{{i18n.cut}}：2023-12-31</text>
+					<text>{{i18n.start}}：{{expressinfo.begin_date}}</text>
+					<text>{{i18n.cut}}：{{expressinfo.end_date}}</text>
 				</view>
 			</view>
 			<!-- 地址 -->
@@ -38,34 +38,53 @@
 				<view class="left u-flex" style="display: flex;" @click="send">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
-						<image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode="">
+						<image @click.stop="changeadd" src="/static/express/change.png"
+							style='width: 40rpx;;height:40rpx ;' mode="">
 						</image>
 					</view>
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
-						<view class="u-row-between " style="">
+						<view v-if="JSON.stringify(topadd)==='{}'" class="u-row-between " style="" @click="send">
 							<view class="pople">{{i18n.sender}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
-						<view class="u-flex">
+						<view v-else class="u-row-between " style="" @click="send">
+							<view class="">
+								<text class="topname">{{topadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(topadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
+						</view>
+						<view class="u-flex" @click.stop="addbook(0)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
 				<view class="left u-flex"
-					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)" @click="recipirnt">
+					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)"
+					@click="recipirnt">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/shou.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
 						</image>
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
-						<view class="u-row-between " style="">
+						<view v-if="JSON.stringify(bottomadd)==='{}'" class="u-row-between " style=""
+							@click="recipirnt">
 							<view class="pople">{{i18n.recipient}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
-						<view class="u-flex">
+						<view v-else class="u-row-between " style="" @click="send">
+							<view class="">
+								<text class="topname">{{bottomadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(bottomadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
+						</view>
+						<view class="u-flex" @click.stop="addbook(1)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -79,11 +98,14 @@
 						<text class="wupin">{{i18n.item}}</text>
 						<view class="mast">{{i18n.required}}</view>
 					</view>
-					<view class="u-flex">
+					<view v-if="JSON.stringify(goodinfo)==='{}'" class="u-flex" @click='goods'>
 						<text class="change">{{i18n.selection}}</text>
 						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
 							mode=""></image>
 					</view>
+					<view v-else class="goodname" @click='goods'>
+						{{goodinfo.goodname}},{{goodinfo.weight}}kg
+					</view>
 				</view>
 			</view>
 			<!-- 下一步 -->
@@ -91,7 +113,7 @@
 				<view class="" style="flex: 1;">
 					<view class="sum">
 						<text>{{i18n.Estimatedprice}}</text>
-						<text style="color: rgba(248, 50, 36, 1);">¥ - -</text>
+						<text style="color: rgba(248, 50, 36, 1);">¥ {{sum?sum:'--'}}</text>
 					</view>
 					<view class="deal u-flex" style="margin-top: 16rpx;">
 						<u-checkbox-group shape='circle' v-model="checkboxValue1" placement="column"
@@ -117,10 +139,16 @@
 			return {
 				deal: -1,
 				checkboxValue1: [],
+				expressinfo: {},
+				topadd: {},
+				bottomadd: {},
+				province_id: '',
+				goodinfo: {}, //物品信息
+				sum: ''
 			}
 		},
 		onLoad(options) {
-
+			this.expressinfo = JSON.parse(decodeURIComponent(options.expressinfo));
 		},
 		computed: {
 			i18n() {
@@ -128,9 +156,51 @@
 			}
 		},
 		methods: {
+			//改变地址
+			changeadd() {
+				var a = {}
+				a = this.topadd
+				this.topadd = this.bottomadd
+				this.bottomadd = a
+				this.province_id = this.bottomadd.province_id
+			},
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+				}
+			},
+			//地址薄
+			addbook(index) {
+				var that = this
+				uni.navigateTo({
+					url: "/pageC/addressManagement/addressManagement?index=" + index,
+					events: {
+						getadd(res) {
+							if (index == 0) {
+								that.topadd = res
+								console.log('topadd', that.topadd);
+							} else {
+								that.bottomadd = res
+								console.log('bottom', that.bottomadd);
+								that.province_id = that.bottomadd.province_id
+							}
+						}
+					}
+				})
+			},
+			//物品信息
 			goods() {
+				var that = this
 				uni.navigateTo({
-					url: '/pageB/goods'
+					url: '/pageB/goods',
+					events: {
+						goodinfo: function(res) {
+							that.goodinfo = res
+							that.group()
+							that.calculate()
+						}
+					}
 				})
 			},
 			//寄件人信息
@@ -149,14 +219,69 @@
 			},
 			next() {
 				uni.navigateTo({
-					url: '/pageB/account'
+					url: '/pageB/account?goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo)) +
+						'&topadd=' + encodeURIComponent(JSON.stringify(this.topadd)) + '&bottomadd=' +
+						encodeURIComponent(JSON.stringify(this.bottomadd)) + '&expressinfo=' + encodeURIComponent(
+							JSON.stringify(this.expressinfo)) + '&orderinfo=' + encodeURIComponent(JSON.stringify(
+							this.orderinfo))
 				})
-			}
+			},
+			//下单
+			group() {
+				uni.$u.http.post('/api/express-order/group-create', {
+					group_package_id: this.expressinfo.id, //		是	String	拼包ID
+					from_address_id: this.topadd.id, //		是	String	寄出地址ID
+					to_address_id: this.bottomadd.id, //		是	String	目标地址ID
+					goods_name: this.goodinfo.goodname, //是	String	商品名称
+					goods_num: this.goodinfo.number, //是	String	商品数量
+					goods_weight: this.goodinfo.weight, //		是	String	商品重量
+					goods_length: Number(this.goodinfo.length), //		是	String	长
+					goods_width: Number(this.goodinfo.width), //		是	String	宽
+					goods_height: Number(this.goodinfo.height),
+				}).then((res) => {
+					this.orderinfo = res
+				}).catch(() => {
+
+				})
+			},
+			calculate() {
+				uni.$u.http.post('/api/express-order/group-calculate', {
+					group_package_id: this.expressinfo.id, //		是	String	拼包ID
+					weight: this.goodinfo.weight, //		是	String	商品重量
+					length: this.goodinfo.length, //		是	String	长
+					width: this.goodinfo.width, //		是	String	宽
+					height: this.goodinfo.height,
+				}).then((res) => {
+					this.sum = res.amount
+				}).catch(() => {
+
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.goodname {
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.topname {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #222222;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
 	.entrepot {
 		width: 702rpx;
 		// height: 360rpx;

pageB/account.vue

@@ -16,24 +16,24 @@
 			<view class="topadd" style="margin-top: 20rpx;">
 				<view class="u-flex u-row-around">
 					<view class="flexc">
-						<view class="entrepotname">东莞仓库</view>
-						<view class="adda">陈盼盼</view>
+						<view class="entrepotname">{{topadd.province_name + topadd.city_name}}</view>
+						<view class="adda">{{topadd.name}}</view>
 					</view>
 					<image src="/pageB/static/images/arrows.png" style="width: 130rpx;height: 10rpx;" mode=""></image>
 					<view class="flexc">
-						<view class="entrepotname">澳大利亚</view>
-						<view class="adda">Curtis Morris</view>
+						<view class="entrepotname">{{bottomadd.country_name}}</view>
+						<view class="adda">{{bottomadd.name}}</view>
 					</view>
 				</view>
 				<view class="topinfo" style="margin-top: 26rpx;">
 					<text class='toptype'>{{i18n.typeof}}：</text>
-					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>日用品</text>
+					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>{{goodinfo.goodname}}</text>
 					<text class='toptype' style='margin:0 14rpx'>|</text>
 					<text class='toptype'>{{i18n.weight}}：</text>
-					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>30.00kg</text>
+					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>{{goodinfo.weight}}kg</text>
 					<text class='toptype' style='margin:0 14rpx'> |</text>
 					<text class='toptype'>{{i18n.number}}：</text>
-					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>20件</text>
+					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>{{goodinfo.number}}件</text>
 				</view>
 			</view>
 			<!-- 地址 -->
@@ -46,11 +46,19 @@
 					</view>
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
-						<view class="u-row-between " style="">
+						<view v-if="JSON.stringify(topadd)==='{}'" class="u-row-between " style=""  @click="send">
 							<view class="pople">{{i18n.sender}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
-						<view class="u-flex">
+						<view v-else class="u-row-between " style="" @click="send">
+							<view class="">
+								<text class="topname">{{topadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(topadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
+						</view>
+						<view class="u-flex" @click.stop="addbook(0)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -64,11 +72,20 @@
 						</image>
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
-						<view class="u-row-between " style="">
+					<view v-if="JSON.stringify(bottomadd)==='{}'" class="u-row-between " style=""
+							@click="recipirnt">
 							<view class="pople">{{i18n.recipient}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
-						<view class="u-flex">
+						<view v-else class="u-row-between " style="" @click="send">
+							<view class="">
+								<text class="topname">{{bottomadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(bottomadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
+						</view>
+						<view class="u-flex" @click.stop="addbook(1)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -77,16 +94,16 @@
 			</view>
 			<view class="entrepot">
 				<view class="entre u-flex u-row-between" style="margin-top: 20rpx;">
-					<text class="title">普通包裹｜海运散货</text>
+					<text class="title">{{expressinfo.type_name}}｜{{expressinfo.containerBase.transport_type_name}}</text>
 				</view>
 				<view class="box u-row-around u-flex">
 					<view class="flexc">
-						<view class="entrepotname">东莞仓库</view>
+						<view class="entrepotname">{{expressinfo.transit_full_address.slice(0,6)}}</view>
 						<view class="adda">{{i18n.Starting}}</view>
 					</view>
 					<image src="/pageB/static/images/arrows.png" style="width: 130rpx;height: 10rpx;" mode=""></image>
 					<view class="flexc">
-						<view class="entrepotname">澳大利亚</view>
+						<view class="entrepotname">{{expressinfo.containerBase.country_name}}</view>
 						<view class="adda">{{i18ndestination}}</view>
 					</view>
 				</view>
@@ -99,7 +116,7 @@
 						<text class="wupin">包裹总重</text>
 					</view>
 					<view class="u-flex">
-						<text class="chang">30kg</text>
+						<text class="chang">{{orderinfo.estimated_weight}}kg</text>
 					</view>
 				</view>
 				<view class="info u-flex u-row-between">
@@ -107,7 +124,7 @@
 						<text class="wupin">{{i18n.price}}</text>
 					</view>
 					<view class="u-flex">
-						<text class="chang">￥24</text>
+						<text class="chang">￥{{orderinfo.estimated_unit_price}}</text>
 					</view>
 				</view>
 				<view class="info u-flex u-row-right">
@@ -116,7 +133,7 @@
 					</view>
 					<view class="u-flex">
 						<text class="chang" style="color: rgba(248, 50, 36, 1);">￥</text>
-						<text style="color: rgba(248, 50, 36, 1);font-size: 38rpx;">2642.5</text>
+						<text style="color: rgba(248, 50, 36, 1);font-size: 38rpx;">{{orderinfo.estimated_price}}</text>
 					</view>
 				</view>
 			</view>
@@ -135,10 +152,19 @@
 			return {
 				deal: -1,
 				checkboxValue1: [],
+				goodinfo:{},
+				topadd:{},
+				bottomadd:{},
+				expressinfo:{},
+				orderinfo:{}
 			}
 		},
 		onLoad(options) {
-
+			this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo));
+			this.topadd = JSON.parse(decodeURIComponent(options.topadd));
+			this.bottomadd = JSON.parse(decodeURIComponent(options.bottomadd));
+			this.expressinfo = JSON.parse(decodeURIComponent(options.expressinfo));
+			this.orderinfo = JSON.parse(decodeURIComponent(options.orderinfo));
 		},
 		computed: {
 			i18n() {
@@ -146,12 +172,18 @@
 			}
 		},
 		methods: {
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+				}
+			},
 			checkboxChange(n) {
 				console.log('change', n);
 			},
 			payorder(){
 				uni.navigateTo({
-					url:'/pageA/payorder'
+					url: '/pageA/payorder?sum=' + this.orderinfo.estimated_price +'&type=' + 'group_pack_order'+'&orderid='+this.orderinfo.id
 				})
 			}
 			// end(){

pageB/delivery.vue

@@ -129,7 +129,7 @@
 		</view>
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
-				<kj-flow ref="child" :goodstype="this.goodinfo.goodtype" @success='success'
+				<kj-flow ref="child" :goodstype="goodinfo.goodtype" :province_id='bottomadd.province_id' @success='success'
 					@close='logshow=false'></kj-flow>
 			</view>
 		</u-popup>
@@ -151,7 +151,8 @@
 				rightname: '',
 				container_id: '',
 				unit_price: '',
-				number: ''
+				number: '',
+				all:0
 			}
 		},
 		onLoad(options) {
@@ -173,11 +174,26 @@
 			i18n() {
 				return this.$t('index')
 			},
-			all() {
-				return this.unit_price * this.goodinfo.weight * this.goodinfo.number
-			}
 		},
 		methods: {
+			//价格计算
+			calculate() {
+				uni.$u.http.get('/api/express-order/calculate', {
+					params: {
+						container_id:this.container_id,// 是 String 货柜ID
+						weight:this.goodinfo.weight, //是 String 重量(kg)
+						length:this.goodinfo.length, //是 String 长(m)
+						width:this.goodinfo.width, //是 String 宽(m)
+						height:this.goodinfo.height, //是 String 高(m)
+						type:this.goodinfo.goodtype //是 String 商品类型: normal.普通商品,
+					}
+				}).then((res) => {
+					console.log(res);
+					this.all = res
+				}).catch(() => {
+
+				})
+			},
 			//跨境物流选择
 			success(msg) {
 				this.logshow = false
@@ -185,6 +201,7 @@
 				this.container_id = msg.dateid
 				this.rightname = msg.rightname
 				this.unit_price = msg.unit_price
+				this.calculate()
 			},
 			//改变地址
 			changeadd() {
@@ -202,13 +219,13 @@
 			},
 			//物流选择
 			changewu() {
-				if (this.province_id) {
+				if (this.province_id && this.goodinfo.goodname) {
 					this.logshow = true
 					setTimeout(() => {
 						this.$refs.child.transport();
 					}, 800)
 				} else {
-					this.$u.toast('请先选择城市')
+					this.$u.toast('请先选择城市和物品信息')
 				}
 			},
 			//地址薄
@@ -237,6 +254,7 @@
 					url: '/pageB/goods',
 					events: {
 						goodinfo: function(res) {
+							console.log(res);
 							that.goodinfo = res
 						}
 					}
@@ -272,7 +290,7 @@
 								this.topadd)) + "&bottom=" + encodeURIComponent(JSON.stringify(this.bottomadd)) +
 							'&leftname=' + this
 							.leftname + "&rightname=" + this.rightname + "&container_id=" + this.container_id +
-							"&unit_price=" + this.unit_price
+							"&unit_price=" + this.unit_price + '&all=' +this.all
 					})
 				}
 			}

pageB/end.vue

@@ -16,12 +16,12 @@
 			<view class="mail">
 				<view class="u-flex u-row-around" style="margin-top: 40rpx;padding: 0 80rpx;">
 					<view class="flexc">
-						<view class="entrepotname">{{topadd.full_address}}</view>
+						<view class="entrepotname">{{topadd.province_name + topadd.city_name}}</view>
 						<view class="adda">{{topadd.name}}</view>
 					</view>
 					<image src="/pageB/static/images/arrows.png" style="width: 130rpx;height: 10rpx;" mode=""></image>
 					<view class="flexc">
-						<view class="entrepotname">{{bottomadd.full_address}}</view>
+						<view class="entrepotname">{{bottomadd.province_name + bottomadd.city_name}}</view>
 						<view class="adda">{{bottomadd.name}}</view>
 					</view>
 				</view>
@@ -90,10 +90,10 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(1)">
+<!-- 						<view class="u-flex" @click.stop="addbook(1)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 			</view>
@@ -157,8 +157,6 @@
 			this.container_id = options.container_id
 			this.unit_price = options.unit_price
 			this.number = options.number
-			this.sum = Number(this.goodinfo.number) * Number(this.goodinfo.weight) * Number(this.unit_price)
-			console.log(this.goodinfo);
 		},
 		onShow() {
 			if (uni.getStorageSync('language') != '') {
@@ -176,17 +174,24 @@
 					from_address_id: this.topadd.id, //1	是	String	寄件地址ID
 					to_address_id: this.bottomadd.id, //2	是	String	收件地址ID
 					container_id: this.container_id, //1	是	String	货柜ID
-					goods_name: this.goodinfo.name, //樱桃	是	String	商品信息名称
+					goods_name: this.goodinfo.goodname, //樱桃	是	String	商品信息名称
 					goods_num: this.goodinfo.number, //100	是	String	商品数量
 					goods_weight: this.goodinfo.weight, //20	是	String	商品重量
-					goods_length: this.length, //30	是	String	商品体积: 长
-					goods_width: this.width, //	40	是	String	商品体积: 宽
-					goods_height: this.height, //	237	是	String	商品体积: 高
+					goods_length: Number(this.goodinfo.height), //30	是	String	商品体积: 长
+					goods_width: Number(this.goodinfo.width), //	40	是	String	商品体积: 宽
+					goods_height: Number(this.goodinfo.height), //	237	是	String	商品体积: 高
 					goods_type: this.goodinfo.goodtype, //normal	是	String	商品类型: normal. 正常商品, special. 特殊商品
 				}).then((res) => {
-					uni.navigateTo({
-						url: '/pageA/payorder?sum=' + this.sum
+					console.log(res)
+					this.$u.toast('下单成功')
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pageB/orderinfo?orderinfo=' + encodeURIComponent(JSON.stringify(res))
+						})
 					})
+					// uni.navigateTo({
+					// 	url: '/pageA/payorder?sum=' + res.estimated_price +'&type=' + 'express_order'+'&orderid='+res.id
+					// })
 				}).catch(() => {
 
 				})
@@ -276,7 +281,7 @@
 
 	.mail {
 		width: 702rpx;
-		height: 332rpx;
+		// height: 332rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		margin-top: 38rpx;

pageB/list/list.vue

@@ -1,51 +1,51 @@
 <template>
 	<!-- 拼包列表 -->
 	<view class="back">
-		<view class="label">
+		<view class="label" v-for="(item,idx) in expressList" :key="idx">
 			<view class="" style="display: flex;">
 				<view class="left flexc">
-					<text class="bourn">目的地</text>
-					<view class="addres">澳大利亚</view>
+					<text class="bourn">{{i18n.destination}}</text>
+					<view class="addres">{{item.containerBase.country_name}}</view>
 				</view>
 				<view class="" style="flex: 1;margin-left: 20rpx;">
 					<view class="u-flex u-row-between">
 						<view class="">
-							<text class='bigtitle'>特殊包裹</text>
+							<text class='bigtitle'>{{item.type_name}}</text>
 							<text style="margin: 0 8rpx;">|</text>
-							<text class='bigtitle'>海运散货</text>
+							<text class='bigtitle'>{{item.transportType.name}}</text>
 						</view>
 						<view class="mon">
-							<text class="timeb">单价</text>
+							<text class="timeb">{{i18n.price}}</text>
 							<text>￥</text>
-							<text style="font-size: 32rpx;">28</text>
-							<text>.00</text>
+							<text style="font-size: 32rpx;">{{item.price.slice(0,-3)}}</text>
+							<text>{{item.price.slice(-3)}}</text>
 						</view>
 					</view>
 					<view class="" style="margin-top: 34rpx;">
-						<u-line-progress activeColor='rgba(255, 21, 21, 1)' :percentage="percentage" height="6"
+						<u-line-progress activeColor='rgba(255, 21, 21, 1)' :percentage="item.progress" height="6"
 							:showText="false"></u-line-progress>
 					</view>
 					<view class="u-flex u-row-between" style="margin-top: 20rpx;">
 						<view class="u-flex">
 							<view class="">
-								<text class='timeb'>已拼 </text>
-								<text class='timeb' style='color:rgba(255, 21, 21, 1)'>200kg</text>
+								<text class='timeb'>{{i18n.already}} </text>
+								<text class='timeb' style='color:rgba(255, 21, 21, 1)'>{{item.used_weight}}kg</text>
 							</view>
 							<text style="margin: 0 8rpx;">|</text>
 							<view class="">
-								<text class='timeb'>剩余重量 </text>
-								<text class='timeb' style='color:rgba(255, 21, 21, 1)'>400kg</text>
+								<text class='timeb'>{{i18n.residue}} </text>
+								<text class='timeb' style='color:rgba(255, 21, 21, 1)'>{{item.residual_weight}}kg</text>
 							</view>
 						</view>
 						<view class="">
-							<text class="timeb">进度50%</text>
+							<text class="timeb">{{i18n.plan}}{{item.progress}}%</text>
 						</view>
 					</view>
 				</view>
 			</view>
 			<view class="u-flex u-row-between" style="margin-top: 32rpx;">
-				<text class="timea">开始时间：2023-12-31/截止时间：2023-12-31</text>
-				<view class="pinb" @click="toaccount">去拼包</view>
+				<text class="timea">{{i18n.start}}：{{item.begin_date}}/{{i18n.cut}}：{{item.end_date}}</text>
+				<view class="pinb" @click="toaccount(item)">{{i18n.goparceling}}</view>
 			</view>
 		</view>
 	</view>
@@ -55,14 +55,37 @@
 	export default {
 		data() {
 			return {
-				percentage: 50, //进度条
+				expressList: []
 			};
 		},
+		onShow() {
+			this.getexpress()
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
+			//拼包列表
+			getexpress() {
+				uni.$u.http.get('/api/express-group-package', {
+					params: {
+						is_page: 0,
+						transport_type_id: "",
+						container_base_id: '',
+						type: '',
+					}
+				}).then((res) => {
+					this.expressList = res
+				}).catch(() => {
+
+				})
+			},
 			//拼包快递
-			toaccount() {
+			toaccount(info) {
 				uni.navigateTo({
-					url: '/pageB/ParcelExpress'
+					url: '/pageB/ParcelExpress?expressinfo=' + encodeURIComponent(JSON.stringify(info))
 				})
 			},
 		}
@@ -78,7 +101,7 @@
 	}
 
 	.back {
-		padding: 20rpx 24rpx;
+		padding: 0rpx 24rpx 20rpx;
 		box-sizing: border-box;
 	}
 

pageB/myPackage.vue

@@ -4,7 +4,7 @@
 		<view class="top">
 			<view class="inputbg u-flex">
 				<u-icon name="search" color="#777777" size="32"></u-icon>
-				<input type="text" :placeholder="i18n.orderSearch" style="flex: 1;margin-left: 12rpx;" />
+				<input type="text" :placeholder="i18n.orderSearch" style="flex: 1;margin-left: 12rpx;" v-model="keyword" />
 			</view>
 			<!-- rgba(252, 97, 74, 1) -->
 			<view class="">
@@ -14,48 +14,75 @@
 		<view class="content">
 			<view class="kg u-flex">
 				<image src="static/images/kg.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
-				<text style="margin-left: 20rpx;">{{i18n.orderWeight}}300kg</text>
+				<text style="margin-left: 20rpx;">{{i18n.orderWeight}}{{sumweight}}kg</text>
 			</view>
-			<view class="info" v-if="current==0">
-				<view class="u-flex u-row-between">
-					<view class="u-flex ">
-						<!-- <view class="tab">{{i18n.purchase}}</view> -->
-						<view class="tab" style="background: rgba(255, 103, 0, 1);">{{i18n.selfPost}}</view>
-						<text class="order">{{i18n.OrderNumber}}：487322109310589</text>
+			<view class="">
+				<view class="info" v-for="(item,idx) in goodslist" :key="idx" style="margin-bottom: 20rpx;">
+					<view class="u-flex u-row-between">
+						<view class="u-flex ">
+							<!-- <view class="tab">{{i18n.purchase}}</view> -->
+							<view class="tab" style="background: rgba(255, 103, 0, 1);">{{i18n.selfPost}}</view>
+							<text class="order">{{i18n.OrderNumber}}：{{item.order_no}}</text>
+						</view>
+						<!-- <text class="order" style="color:rgba(248, 50, 36, 1) ;">{{i18n.receiveGoods}}</text> -->
+						<text v-if="item.status=='imperfect'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">待完善</text>
+						<text v-if="item.status=='domestic_undelivered'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">国内未发货</text>
+						<text v-if="item.status=='domestic_delivered'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">国内已发货</text>
+						<text v-if="item.status=='domestic_received'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">国内已收货</text>
+						<text v-if="item.status=='unpaid'" class="order" style="color:rgba(248, 50, 36, 1) ;">待付款</text>
+						<text v-if="item.status=='overseas_undelivered'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">国际未发货</text>
+						<text v-if="item.status=='overseas_delivered'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">国际已发货</text>
+						<text v-if="item.status=='overseas_received'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">国际已收货</text>
+						<text v-if="item.status=='finished'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">已完成</text>
+						<text v-if="item.status=='closed'" class="order" style="color:rgba(248, 50, 36, 1) ;">已关闭</text>
+						<text v-if="item.status=='refunding'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">退款中</text>
+						<text v-if="item.status=='refunded'" class="order"
+							style="color:rgba(248, 50, 36, 1) ;">已退款</text>
 					</view>
-					<text class="order" style="color:rgba(248, 50, 36, 1) ;">{{i18n.receiveGoods}}</text>
-				</view>
-				<view class="u-flex u-row-around" style="margin-top: 40rpx;">
-					<view class="flexc">
-						<view class="entrepotname">东莞仓库</view>
-						<view class="adda">陈盼盼</view>
+					<view class="u-flex u-row-around" style="margin-top: 40rpx;">
+						<view class="flexc">
+							<view class="entrepotname">{{item.from_full_address}}</view>
+							<view class="adda">{{item.from_name}}</view>
+						</view>
+						<image src="/pageB/static/images/arrows.png" style="width: 130rpx;height: 10rpx;" mode="">
+						</image>
+						<view class="flexc">
+							<view class="entrepotname">{{item.to_full_address}}</view>
+							<view class="adda">{{item.to_name}}</view>
+						</view>
 					</view>
-					<image src="/pageB/static/images/arrows.png" style="width: 130rpx;height: 10rpx;" mode=""></image>
-					<view class="flexc">
-						<view class="entrepotname">澳大利亚</view>
-						<view class="adda">Curtis Morris</view>
+					<view class="" style="margin-top: 36rpx;text-align: right;">
+						<text class="sum">{{i18n.total}}</text>
+						<text class="money" style="">¥</text>
+						<text class="money" style="font-size: 36rpx;">{{item.estimated_price}}</text>
+						<!-- <text class="money">.00</text> -->
 					</view>
-				</view>
-				<view class="" style="margin-top: 36rpx;text-align: right;">
-					<text class="sum">{{i18n.total}}</text>
-					<text class="money" style="">¥</text>
-					<text class="money" style="font-size: 36rpx;">1280</text>
-					<text class="money">.00</text>
-				</view>
-				<view class="content-bottom u-flex u-row-between">
-					<text class="weight">{{i18n.Parcelweight}}：45kg</text>
-					<view class="u-flex">
-						<view class="btn">{{i18n.Frozen}}</view>
-						<view class="btn">{{i18n.details}}</view>
-						<!-- <view class="btn">{{i18n.recover}}</view> -->
-						<!-- 						<view class="btn"
-							style="background-color:rgba(248, 50, 36, 1) ;color: #fff;border: 2rpx solid rgba(248, 50, 36, 0);">
-							{{i18n.payment}}
+					<view class="content-bottom u-flex u-row-between">
+						<text class="weight">{{i18n.Parcelweight}}：{{item.estimated_weight}}kg</text>
+						<view class="u-flex">
+							<!-- 冻结 -->
+							<view class="btn" v-if="item.is_frozen==1" @click="frozen(item.id)">{{i18n.Frozen}}</view>
+							<view class="btn">{{i18n.recover}}</view>
+							<!-- 查看详情 -->
+							<view class="btn" @click="detail(item.id)">{{i18n.details}}</view>
+							<view class="btn"
+								style="background-color:rgba(248, 50, 36, 1) ;color: #fff;border: 2rpx solid rgba(248, 50, 36, 0);">
+								{{i18n.payment}}
+							</view>
+							<view class="btn"
+								style="background-color:rgba(248, 50, 36, 1) ;color: #fff;border: 2rpx solid rgba(248, 50, 36, 0);">
+								{{i18n.mail}}
+							</view>
 						</view>
-						<view class="btn"
-							style="background-color:rgba(248, 50, 36, 1) ;color: #fff;border: 2rpx solid rgba(248, 50, 36, 0);">
-							{{i18n.mail}}
-						</view> -->
 					</view>
 				</view>
 			</view>
@@ -70,16 +97,15 @@
 				current: 0, //tab切换
 				list1: [],
 				status: '', //状态
+				goodslist: [],
+				sumweight: 0,
+				to_transit: 0, //发往中转点
+				transit_receipt: 0, //中转已签收
+				to_overseas: 0 ,//正发往海外
+				keyword:'',//关键词搜索
 			};
 		},
 		onLoad(options) {
-			this.list1 = [{
-				name: this.i18n.deliver,
-			}, {
-				name: this.i18n.Sign,
-			}, {
-				name: this.i18n.overseas
-			}]
 			console.log(options);
 			this.current = options.index
 			if (this.current == 0) {
@@ -96,21 +122,57 @@
 			}
 		},
 		onShow() {
+			this.getnumber()
 			uni.setNavigationBarTitle({
 				title: this.i18n.mine + this.i18n.parcel
 			})
 			this.getlist()
 		},
 		methods: {
+			detail(id) {
+
+			},
+			//冻结
+			frozen(id) {
+				uni.$u.http
+					.post(`/api/address/default/${id}`)
+					.then((res) => {
+						console.log(res);
+					})
+					.catch(() => {});
+			},
 			//获取列表
 			getlist() {
 				uni.$u.http.get('/api/express-order?', {
 					params: {
+						order_no:this.keyword,
 						container_id: '',
 						status_collection: this.status
 					}
 				}).then((res) => {
-					console.log(res);
+					this.goodslist = res.data
+					this.goodslist.forEach((item) => {
+						this.sumweight += Number(item.estimated_weight)
+					})
+				}).catch(() => {
+
+				})
+			},
+			//获取列表数量
+			getnumber() {
+				uni.$u.http.get('/api/express-order/status-count', {
+
+				}).then((res) => {
+					this.to_transit = res.to_transit //发往中转点
+					this.transit_receipt = res.transit_receipt //发往中转点
+					this.to_overseas = res.to_overseas //发往中转点
+					this.list1 = [{
+						name: this.i18n.deliver + this.to_transit,
+					}, {
+						name: this.i18n.Sign + this.transit_receipt,
+					}, {
+						name: this.i18n.overseas + this.to_overseas
+					}]
 				}).catch(() => {
 
 				})
@@ -222,6 +284,8 @@
 			line-height: 44rpx;
 			text-align: left;
 			font-style: normal;
+			text-align: center;
+			width: 300rpx;
 		}
 
 		.tab {

pageB/orderinfo.vue

@@ -2,38 +2,60 @@
 	<view class="back">
 		<view class="top u-flex u-row-between">
 			<text class="success">{{i18n.successful}}</text>
-			<text class="sun">{{i18n.pickpackage}}</text>
+			<!-- <text class="sun">{{i18n.pickpackage}}</text> -->
+			<text v-if="orderinfo.status=='imperfect'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">待完善</text>
+			<text v-if="orderinfo.status=='domestic_undelivered'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">国内未发货</text>
+			<text v-if="orderinfo.status=='domestic_delivered'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">国内已发货</text>
+			<text v-if="orderinfo.status=='domestic_received'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">国内已收货</text>
+			<text v-if="orderinfo.status=='unpaid'" class="order" style="color:rgba(248, 50, 36, 1) ;">待付款</text>
+			<text v-if="orderinfo.status=='overseas_undelivered'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">国际未发货</text>
+			<text v-if="orderinfo.status=='overseas_delivered'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">国际已发货</text>
+			<text v-if="orderinfo.status=='overseas_received'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">国际已收货</text>
+			<text v-if="orderinfo.status=='finished'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">已完成</text>
+			<text v-if="orderinfo.status=='closed'" class="order" style="color:rgba(248, 50, 36, 1) ;">已关闭</text>
+			<text v-if="orderinfo.status=='refunding'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">退款中</text>
+			<text v-if="orderinfo.status=='refunded'" class="order"
+				style="color:rgba(248, 50, 36, 1) ;">已退款</text>
 		</view>
 		<view class="address">
 			<view class="" style="margin-top: 44rpx;">
 				<view class="u-flex">
 					<image src="/static/express/ji.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
-					<text class="name" style="margin-left: 28rpx;">陈盼盼</text>
-					<text class="name" style="margin-left: 12rpx;">134****8314</text>
+					<text class="name" style="margin-left: 28rpx;">{{orderinfo.from_name}}</text>
+					<text class="name" style="margin-left: 12rpx;">{{orderinfo.from_mobile}}</text>
 				</view>
 				<view style="margin-top: 20rpx;margin-left: 70rpx;" class="info">
-					上海浦东新区南汇新城镇上海市浦东新区保税
+					{{orderinfo.from_full_address}}
 				</view>
 			</view>
 			<view class="" style="margin: 44rpx 0;">
 				<view class="u-flex">
 					<image src="/static/express/ji.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
-					<text class="name" style="margin-left: 28rpx;">陈盼盼</text>
-					<text class="name" style="margin-left: 12rpx;">134****8314</text>
+					<text class="name" style="margin-left: 28rpx;">{{orderinfo.transit_name}}</text>
+					<text class="name" style="margin-left: 12rpx;">{{orderinfo.transit_mobile}}</text>
 				</view>
 				<view style="margin-top: 20rpx;margin-left: 70rpx;" class="info">
-					上海浦东新区南汇新城镇上海市浦东新区保税
+					{{orderinfo.transit_full_address}}
 				</view>
 			</view>
 		</view>
 		<view class="orderinfo">
 			<view class="num">
 				<text class='num'>{{i18n.OrderNumber}}：</text>
-				<text class='num'>JDV18873891934</text>
+				<text class='num'>{{orderinfo.order_no}}</text>
 			</view>
 			<view class="num" style="margin-top: 50rpx;">
-				<text class='num'>{{i18n.Ordertime}}：：</text>
-				<text class='num'>2023-12-03 22:44:15</text>
+				<text class='num'>{{i18n.Ordertime}}：</text>
+				<text class='num'>{{orderinfo.created_at}}</text>
 			</view>
 		</view>
 	</view>
@@ -43,9 +65,13 @@
 	export default {
 		data() {
 			return {
-
+				orderinfo: {}
 			};
 		},
+		onLoad(options) {
+			this.orderinfo = JSON.parse(decodeURIComponent(options.orderinfo));
+			console.log(this.orderinfo);
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')

pageB/parcel.vue

@@ -4,23 +4,23 @@
 		<view class="box" style="border-radius: 16rpx 16rpx 0 0 ">
 			<view class="boxitem u-flex">
 				<text class="name">{{i18n.TrackingNumber}}</text>
-				<input style="flex: 1;" type="text" :placeholder="i18n.trackingNumber" />
+				<input style="flex: 1;" type="text" :placeholder="i18n.trackingNumber" v-model="logistics_no" />
 			</view>
 		</view>
 		<view class="box">
 			<view class="boxitem u-flex">
 				<text class="name">{{i18n.Expresscompany}}</text>
-				<input style="flex: 1;" type="text" :placeholder="i18n.ExpressCompany" />
+				<input style="flex: 1;" type="text" :placeholder="i18n.ExpressCompany" v-model="logistics_company_name" />
 			</view>
 		</view>
 		<view class="box" style="border-radius:0 0 16rpx 16rpx">
 			<view class="boxitem u-flex">
 				<text class="name">{{i18n.Parcelweight}}</text>
-				<input style="flex: 1;" type="text" :placeholder="i18n.parcelWeight" />
+				<input style="flex: 1;" type="text" :placeholder="i18n.parcelWeight" v-model="estimated_weight" />
 				<text>kg</text>
 			</view>
 		</view>
-		<view class="btn">
+		<view class="btn" @click="offline">
 			{{i18n.Addlist}}
 		</view>
 	</view>
@@ -30,7 +30,9 @@
 	export default {
 		data() {
 			return {
-
+				logistics_company_name:'',//	顺丰快递	是	String	快递公司
+				logistics_no:'',//11111111	是	String	快递单号
+				estimated_weight:'',//	222	是	String	包裹重量
 			};
 		},
 		computed: {
@@ -43,6 +45,26 @@
 				title: this.i18n.Addparcel
 			})
 		},
+		methods:{
+			//线下下单
+			offline() {
+				uni.$u.http.post('/api/express-order/offline-create', {
+					logistics_company_name:this.logistics_company_name,//	顺丰快递	是	String	快递公司
+					logistics_no:this.logistics_no,//11111111	是	String	快递单号
+					estimated_weight:this.estimated_weight,//	222	是	String	包裹重量
+				}).then((res) => {
+					this.$u.toast('添加成功')
+					// uni.navigateTo({
+					// 	url:'pageB/myPackage'
+					// })
+					setTimeout(()=>{
+						uni.navigateBack()
+					},800)
+				}).catch(() => {
+			
+				})
+			},
+		}
 	}
 </script>
 

pages/express/express.vue

@@ -168,51 +168,52 @@
 				</view>
 			</view>
 			<!-- 拼包数据 -->
-			<view class="label">
+			<view class="label" v-for="(item,idx) in expressList" :key="idx">
 				<view class="" style="display: flex;">
 					<view class="left flexc">
-						<text class="bourn">目的地</text>
-						<view class="addres">澳大利亚</view>
+						<text class="bourn">{{i18n.destination}}</text>
+						<view class="addres">{{item.containerBase.country_name}}</view>
 					</view>
 					<view class="" style="flex: 1;margin-left: 20rpx;">
 						<view class="u-flex u-row-between">
 							<view class="">
-								<text class='bigtitle'>特殊包裹</text>
+								<text class='bigtitle'>{{item.type_name}}</text>
 								<text style="margin: 0 8rpx;">|</text>
-								<text class='bigtitle'>海运散货</text>
+								<text class='bigtitle'>{{item.transportType.name}}</text>
 							</view>
 							<view class="mon">
 								<text class="timeb">{{i18n.price}}</text>
 								<text>￥</text>
-								<text style="font-size: 32rpx;">28</text>
-								<text>.00</text>
+								<text v-if="item.price" style="font-size: 32rpx;">{{item.price.slice(0,-3)}}</text>
+								<text v-if="item.price">{{item.price.slice(-3)}}</text>
 							</view>
 						</view>
 						<view class="" style="margin-top: 34rpx;">
-							<u-line-progress activeColor='rgba(255, 21, 21, 1)' :percentage="percentage" height="6"
+							<u-line-progress activeColor='rgba(255, 21, 21, 1)' :percentage="item.progress" height="6"
 								:showText="false"></u-line-progress>
 						</view>
 						<view class="u-flex u-row-between" style="margin-top: 20rpx;">
 							<view class="u-flex">
 								<view class="">
 									<text class='timeb'>{{i18n.already}} </text>
-									<text class='timeb' style='color:rgba(255, 21, 21, 1)'>200kg</text>
+									<text class='timeb' style='color:rgba(255, 21, 21, 1)'>{{item.used_weight}}kg</text>
 								</view>
 								<text style="margin: 0 8rpx;">|</text>
 								<view class="">
 									<text class='timeb'>{{i18n.residue}} </text>
-									<text class='timeb' style='color:rgba(255, 21, 21, 1)'>400kg</text>
+									<text class='timeb'
+										style='color:rgba(255, 21, 21, 1)'>{{item.residual_weight}}kg</text>
 								</view>
 							</view>
 							<view class="">
-								<text class="timeb">{{i18n.plan}}50%</text>
+								<text class="timeb">{{i18n.plan}}{{item.progress}}%</text>
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="u-flex u-row-between" style="margin-top: 32rpx;">
-					<text class="timea">{{i18n.start}}：2023-12-31/{{i18n.cut}}：2023-12-31</text>
-					<view class="pinb" @click="toaccount">{{i18n.goparceling}}</view>
+					<text class="timea">{{i18n.start}}：{{item.begin_date}}/{{i18n.cut}}：{{item.end_date}}</text>
+					<view class="pinb" @click="toaccount(item)">{{i18n.goparceling}}</view>
 				</view>
 			</view>
 		</view>
@@ -223,7 +224,7 @@
 			</view>
 		</u-popup>
 		<!-- <u-button @click="show = true">打开</u-button> -->
-		<!-- <view class="" style="height: 160rpx;"></view> -->
+		<view class="" style="height: 160rpx;"></view>
 		<kj-tabbar :value1=0></kj-tabbar>
 	</view>
 </template>
@@ -250,7 +251,8 @@
 				container_id: '', //货柜列表
 				language: 'zh-CN',
 				goodinfo: {}, //物品信息
-				unit_price:'',
+				unit_price: '',
+				expressList: []
 			}
 		},
 		onLoad(options) {
@@ -270,6 +272,7 @@
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')
 			}
+			this.getexpress()
 		},
 		computed: {
 			i18n() {
@@ -277,6 +280,23 @@
 			}
 		},
 		methods: {
+			//拼包列表
+			getexpress() {
+				uni.$u.http.get('/api/express-group-package', {
+					params: {
+						is_page: 0,
+						page: 1,
+						limit: 3,
+						transport_type_id: "",
+						container_base_id: '',
+						type: '',
+					}
+				}).then((res) => {
+					this.expressList = res
+				}).catch(() => {
+
+				})
+			},
 			//跨境物流选择
 			success(msg) {
 				this.logshow = false
@@ -366,9 +386,9 @@
 				})
 			},
 			//拼包快递
-			toaccount() {
+			toaccount(info) {
 				uni.navigateTo({
-					url: '/pageB/ParcelExpress'
+					url: '/pageB/ParcelExpress?expressinfo=' + encodeURIComponent(JSON.stringify(info))
 				})
 			},
 			//物流计算器

pages/index/index.vue

@@ -170,7 +170,7 @@
 							¥{{item.is_discount==0?item.discount_price:item.price}}
 						</text>
 						<text class="weight">
-							¥{{item.weight}}kg
+							¥{{item.weight}}/kg
 						</text>
 					</view>
 					<view class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
@@ -181,16 +181,16 @@
 						<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
 							style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
 							<text v-if="language =='zh-CN'">
-								{{item.name_cn}}
+								{{child.name_cn}}
 							</text>
 							<text v-if="language =='en-US'">
-								{{item.name_en}}
+								{{child.name_en}}
 							</text>
 							<text v-if="language =='es-ES'">
-								{{item.name_es}}
+								{{child.name_es}}
 							</text>
 							<text v-if="language =='it-IT'">
-								{{item.name_ita}}
+								{{child.name_ita}}
 							</text>
 						</view>
 						<!-- <view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
@@ -200,15 +200,15 @@
 		</view>
 
 		<u-popup :show="show" mode='center' :round='16' bgColor='transparent'>
-			<view style="position: relative;">
+			<view style="position: relative;" @click="advert">
 				<image :src="configimage" style="width: 570rpx;height: 764rpx;border-radius: 16rpx;" mode=""></image>
-				<view class="" style="text-align: center;" @click='show=false'>
+				<view class="" style="text-align: center;" @click.stop='show=false'>
 					<image src="../../static/images/index/close.png" mode="" style="width: 70rpx;height: 70rpx;">
 					</image>
 				</view>
 			</view>
 		</u-popup>
-		<!-- <view class="" style="height: 160rpx;" v-if="recomlist.length >3"></view> -->
+		<view class="" style="height: 160rpx;" v-if="recomlist.length >3"></view>
 		<kj-tabbar :value1=1></kj-tabbar>
 	</view>
 </template>
@@ -246,6 +246,7 @@
 				parent_id: '',
 				last_page: '',
 				configimage: '',
+				url: ''
 			}
 		},
 		computed: {
@@ -254,13 +255,13 @@
 			}
 		},
 		onReachBottom() {
-			if (this.page == this.last_page) {
-				this.$u.toast('已无更多数据')
-			} else {
+			if (this.page < this.last_page) {
 				if (this.current != 0) {
 					this.page++
 					this.goods(this.parent_id)
 				}
+			} else {
+				this.$u.toast('已无更多数据')
 			}
 		},
 		onLoad(options) {
@@ -288,6 +289,12 @@
 			}
 		},
 		methods: {
+			advert() {
+				console.log(this.url);
+				uni.navigateTo({
+					url: this.url
+				})
+			},
 			//广告弹窗
 			config() {
 				uni.$u.http.get('api/config', {
@@ -297,6 +304,7 @@
 				}).then((res) => {
 					console.log(res);
 					this.configimage = res.image
+					this.url = res.url
 				}).catch(() => {
 
 				})
@@ -497,10 +505,10 @@
 		width: 300rpx;
 		// height: 70rpx;
 		overflow: hidden;
-		text-overflow: ellipsis ;
+		text-overflow: ellipsis;
 		-webkit-line-clamp: 2;
 		display: -webkit-box;
-		-webkit-box-orient:vertical;
+		-webkit-box-orient: vertical;
 	}
 
 	.weight {

pages/login/login.vue

@@ -1,35 +1,23 @@
 <template>
 	<!-- 登录 -->
-	<view style="padding: 0 44rpx">
+	<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> -->
+		<button open-type="getPhoneNumber" class="login-btn" @getphonenumber="tologin">
+			微信授权登录
+		</button>
 
-		<view>
+		<!-- 		<view>
 			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
 			<u--input placeholder="请输入内容" border="surround" v-model="code"></u--input>
-		</view>
-		<button @click="submit">登录</button>
+		</view> -->
+		<!-- <button @click="submit">登录</button> -->
 		<view class="" style="margin-top: 42rpx; display: flex">
-			<!-- <u-checkbox-group
-        v-model="checkboxValue1"
-        placement="column"
-        @change="checkboxChange"
-      >
-        <u-checkbox
-          shape="circle"
-          :customStyle="{ marginBottom: '8px' }"
-          :name="1"
-        >
-        </u-checkbox>
-      </u-checkbox-group> -->
+			<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+				<u-checkbox shape="circle" :customStyle="{ marginBottom: '8px' }" :name="1">
+				</u-checkbox>
+			</u-checkbox-group>
 			<text class="fontYin">我已阅读并同意</text>
 			<text class="fontYin" style="color: #f83224">《用户协议》</text>
 			<text class="fontYin">和</text>
@@ -48,11 +36,62 @@
 				mobile: "",
 				code: "",
 				checkboxValue1: false,
+				changea: []
 			};
 		},
 		methods: {
+			//微信登录
+			tologin(e) {
+				if (this.changea.length > 0) {
+					if (e.detail.code) {
+						var phoneCode = e.detail.code
+						uni.login({
+							success: (code) => {
+								uni.$u.http.post('/api/wxmini/login', {
+									code: code.code
+								}).then((res) => {
+									console.log(res);
+									if (res == 10011) {
+										uni.$u.http.post('/api/wxmini/mobile', {
+											code: phoneCode
+										}).then((res) => {
+											uni.$u.http.post('/api/register', {
+												wx_code: code
+													.code, //		是	String	微信登录时候的code
+												mobile: res.mobile //	是	String	手机号码
+											}).then((res) => {
+												uni.setStorageSync('token', res.token)
+												setTimeout(() => {
+													uni.switchTab({
+														url: '/pages/index/index'
+													})
+												}, 800)
+											}).catch(() => {
+
+											})
+										}).catch(() => {
+
+										})
+									} else {
+										uni.setStorageSync('token', res.token)
+										this.$u.toast('登录成功')
+										setTimeout(() => {
+											uni.switchTab({
+												url: '/pages/index/index'
+											})
+										}, 800)
+									}
+								}).catch(() => {})
+							}
+						})
+					}
+				} else {
+					this.$u.toast('请勾选隐私协议')
+				}
+			},
 			checkboxChange(n) {
 				console.log("change", n);
+				this.changea = n
 			},
 			submit() {
 				// login({ mobile: "13000000000", password: "123456" }).then((res) => {
@@ -73,7 +112,7 @@
 					mobile: "13000000000",
 					password: "123456"
 				}).then((res) => {
-					uni.setStorageSync('token', res.token)   
+					uni.setStorageSync('token', res.token)
 					uni.switchTab({
 						url: '/pages/index/index'
 					})
@@ -86,6 +125,11 @@
 </script>
 
 <style lang="scss" scoped>
+	page {
+		background-color: #ffffff !important;
+		height: 100vh;
+	}
+
 	.login-btn {
 		width: 662rpx;
 		height: 96rpx;

pages/shopping/shopping.vue

@@ -89,7 +89,7 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="" style="height: 80rpx;"></view> -->
+		<view class="" style="height: 80rpx;"></view>
 		<view class="" style="height: 160rpx;"></view>
 		<kj-tabbar :value1=2></kj-tabbar>
 	</view>
@@ -242,7 +242,7 @@
 				text-overflow: ellipsis;
 				-webkit-line-clamp: 2;
 				display: -webkit-box;
-				-webkit-box-orient:vertical;
+				-webkit-box-orient: vertical;
 			}
 
 			.tabsa {

unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -148,6 +148,16 @@ var render = function () {
   var g1 = JSON.stringify(_vm.bottomadd)
   var m1 = !(g1 === "{}") ? _vm.replacePhoneToStar(_vm.bottomadd.mobile) : null
   var g2 = JSON.stringify(_vm.goodinfo)
+  var l0 = _vm.__map(_vm.expressList, function (item, idx) {
+    var $orig = _vm.__get_orig(item)
+    var g3 = item.price ? item.price.slice(0, -3) : null
+    var g4 = item.price ? item.price.slice(-3) : null
+    return {
+      $orig: $orig,
+      g3: g3,
+      g4: g4,
+    }
+  })
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       _vm.logshow = false
@@ -162,6 +172,7 @@ var render = function () {
         g1: g1,
         m1: m1,
         g2: g2,
+        l0: l0,
       },
     }
   )
@@ -434,6 +445,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {
@@ -465,7 +477,8 @@ var _default = {
       language: 'zh-CN',
       goodinfo: {},
       //物品信息
-      unit_price: ''
+      unit_price: '',
+      expressList: []
     };
   },
   onLoad: function onLoad(options) {
@@ -484,6 +497,7 @@ var _default = {
     if (uni.getStorageSync('language') != '') {
       this.language = uni.getStorageSync('language');
     }
+    this.getexpress();
   },
   computed: {
     i18n: function i18n() {
@@ -491,6 +505,22 @@ var _default = {
     }
   },
   methods: {
+    //拼包列表
+    getexpress: function getexpress() {
+      var _this = this;
+      uni.$u.http.get('/api/express-group-package', {
+        params: {
+          is_page: 0,
+          page: 1,
+          limit: 3,
+          transport_type_id: "",
+          container_base_id: '',
+          type: ''
+        }
+      }).then(function (res) {
+        _this.expressList = res;
+      }).catch(function () {});
+    },
     //跨境物流选择
     success: function success(msg) {
       this.logshow = false;
@@ -501,11 +531,11 @@ var _default = {
     },
     //物流选择
     changewu: function changewu() {
-      var _this = this;
+      var _this2 = this;
       if (this.province_id) {
         this.logshow = true;
         setTimeout(function () {
-          _this.$refs.child.transport();
+          _this2.$refs.child.transport();
         }, 800);
       } else {
         this.$u.toast('请先选择城市');
@@ -546,12 +576,12 @@ var _default = {
     },
     //我的包裹
     express: function express() {
-      var _this2 = this;
+      var _this3 = this;
       uni.$u.http.get('/api/express-order/status-count', {}).then(function (res) {
         console.log(res);
-        _this2.overseas = res.to_overseas;
-        _this2.receipt = res.transit_receipt;
-        _this2.transit = res.to_transit;
+        _this3.overseas = res.to_overseas;
+        _this3.receipt = res.transit_receipt;
+        _this3.transit = res.to_transit;
       }).catch(function () {});
     },
     todev: function todev() {
@@ -575,9 +605,9 @@ var _default = {
       });
     },
     //拼包快递
-    toaccount: function toaccount() {
+    toaccount: function toaccount(info) {
       uni.navigateTo({
-        url: '/pageB/ParcelExpress'
+        url: '/pageB/ParcelExpress?expressinfo=' + encodeURIComponent(JSON.stringify(info))
       });
     },
     //物流计算器

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -143,11 +143,21 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var g0 = _vm.recomlist.length
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
+      $event.stopPropagation()
       _vm.show = false
     }
   }
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        g0: g0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -431,7 +441,8 @@ var _default = {
       index: 0,
       parent_id: '',
       last_page: '',
-      configimage: ''
+      configimage: '',
+      url: ''
     };
   },
   computed: {
@@ -440,13 +451,13 @@ var _default = {
     }
   },
   onReachBottom: function onReachBottom() {
-    if (this.page == this.last_page) {
-      this.$u.toast('已无更多数据');
-    } else {
+    if (this.page < this.last_page) {
       if (this.current != 0) {
         this.page++;
         this.goods(this.parent_id);
       }
+    } else {
+      this.$u.toast('已无更多数据');
     }
   },
   onLoad: function onLoad(options) {
@@ -473,6 +484,12 @@ var _default = {
     }
   },
   methods: {
+    advert: function advert() {
+      console.log(this.url);
+      uni.navigateTo({
+        url: this.url
+      });
+    },
     //广告弹窗
     config: function config() {
       var _this = this;
@@ -483,6 +500,7 @@ var _default = {
       }).then(function (res) {
         console.log(res);
         _this.configimage = res.image;
+        _this.url = res.url;
       }).catch(function () {});
     },
     //海外包邮接口

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -100,8 +100,11 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
-    "u-Input": function () {
-      return Promise.all(/*! import() | uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u--input/u--input.vue */ 949))
+    uCheckboxGroup: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 900))
+    },
+    uCheckbox: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 926))
     },
   }
 } catch (e) {
@@ -193,29 +196,65 @@ var _homeApi = __webpack_require__(/*! ../../network/api/homeApi.js */ 211);
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {
       mobile: "",
       code: "",
-      checkboxValue1: false
+      checkboxValue1: false,
+      changea: []
     };
   },
   methods: {
+    //微信登录
+    tologin: function tologin(e) {
+      var _this = this;
+      if (this.changea.length > 0) {
+        if (e.detail.code) {
+          var phoneCode = e.detail.code;
+          uni.login({
+            success: function success(code) {
+              uni.$u.http.post('/api/wxmini/login', {
+                code: code.code
+              }).then(function (res) {
+                console.log(res);
+                if (res == 10011) {
+                  uni.$u.http.post('/api/wxmini/mobile', {
+                    code: phoneCode
+                  }).then(function (res) {
+                    uni.$u.http.post('/api/register', {
+                      wx_code: code.code,
+                      //		是	String	微信登录时候的code
+                      mobile: res.mobile //	是	String	手机号码
+                    }).then(function (res) {
+                      uni.setStorageSync('token', res.token);
+                      setTimeout(function () {
+                        uni.switchTab({
+                          url: '/pages/index/index'
+                        });
+                      }, 800);
+                    }).catch(function () {});
+                  }).catch(function () {});
+                } else {
+                  uni.setStorageSync('token', res.token);
+                  _this.$u.toast('登录成功');
+                  setTimeout(function () {
+                    uni.switchTab({
+                      url: '/pages/index/index'
+                    });
+                  }, 800);
+                }
+              }).catch(function () {});
+            }
+          });
+        }
+      } else {
+        this.$u.toast('请勾选隐私协议');
+      }
+    },
     checkboxChange: function checkboxChange(n) {
       console.log("change", n);
+      this.changea = n;
     },
     submit: function submit() {
       // login({ mobile: "13000000000", password: "123456" }).then((res) => {

unpackage/dist/dev/mp-weixin/pages/login/login.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "登录",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u--input": "/uview-ui/components/u--input/u--input"
+    "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
+    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox"
   }
 }

unpackage/dist/dev/mp-weixin/pages/login/login.wxml

@@ -1 +1 @@
-<view style="padding:0 44rpx;" class="data-v-b237504c"><view style="text-align:center;margin-top:156rpx;" class="data-v-b237504c"><image style="width:350rpx;height:350rpx;" src="../../static/images/logo.png" mode class="data-v-b237504c"></image></view><view class="data-v-b237504c"><u--input bind:input="__e" vue-id="35a7246c-1" placeholder="请输入内容" border="surround" value="{{mobile}}" data-event-opts="{{[['^input',[['__set_model',['','mobile','$event',[]]]]]]}}" class="data-v-b237504c" bind:__l="__l"></u--input><u--input bind:input="__e" vue-id="35a7246c-2" placeholder="请输入内容" border="surround" value="{{code}}" data-event-opts="{{[['^input',[['__set_model',['','code','$event',[]]]]]]}}" class="data-v-b237504c" bind:__l="__l"></u--input></view><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c">登录</button><view style="margin-top:42rpx;display:flex;" class="data-v-b237504c"><text class="fontYin data-v-b237504c">我已阅读并同意</text><text class="fontYin data-v-b237504c" style="color:#f83224;">《用户协议》</text><text class="fontYin data-v-b237504c">和</text><text class="fontYin data-v-b237504c" style="color:#f83224;">《隐私协议》</text></view></view>
+<view style="padding:0 44rpx;background-color:#fff;height:100vh;overflow:hidden;" class="data-v-b237504c"><view style="text-align:center;margin-top:156rpx;" class="data-v-b237504c"><image style="width:350rpx;height:350rpx;" src="../../static/images/logo.png" mode class="data-v-b237504c"></image></view><button class="login-btn data-v-b237504c" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['tologin',['$event']]]]]}}" bindgetphonenumber="__e">微信授权登录</button><view style="margin-top:42rpx;display:flex;" class="data-v-b237504c"><u-checkbox-group vue-id="35a7246c-1" placement="column" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-b237504c" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('35a7246c-2')+','+('35a7246c-1')}}" shape="circle" customStyle="{{({marginBottom:'8px'})}}" name="{{1}}" class="data-v-b237504c" bind:__l="__l"></u-checkbox></u-checkbox-group><text class="fontYin data-v-b237504c">我已阅读并同意</text><text class="fontYin data-v-b237504c" style="color:#f83224;">《用户协议》</text><text class="fontYin data-v-b237504c">和</text><text class="fontYin data-v-b237504c" style="color:#f83224;">《隐私协议》</text></view></view>

unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -24,6 +24,10 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+page.data-v-b237504c {
+  background-color: #ffffff !important;
+  height: 100vh;
+}
 .login-btn.data-v-b237504c {
   width: 662rpx;
   height: 96rpx;

unpackage/dist/dev/mp-weixin/project.config.json

@@ -20,7 +20,7 @@
   "compileType": "miniprogram",
   "libVersion": "3.4.3",
   "appid": "wx84ab1b5d609b805d",
-  "projectname": "wx",
+  "projectname": "kjds",
   "condition": {
     "search": {
       "current": -1,