解决冲突

commont/messages.js

@@ -273,7 +273,8 @@ export default {
       //个人功能
       thatPerson: "个人功能",
       become: "成为团长",
-	  chase:'购'
+	  chase:'购',
+	  Ladder:'阶梯首重续费模式'
     },
   },
   //英语
@@ -546,7 +547,8 @@ export default {
       //个人功能
       thatPerson: "Personal functions",
       become: "Become a team leader",
-	  chase:'purchase'
+	  chase:'purchase',
+	  Ladder:'Ladder first renewal fee model'
     },
   },
   // 西班牙
@@ -821,8 +823,8 @@ export default {
       //个人功能
       thatPerson: "Función personal",
       become: "Convertirse en Jefe de grupo",
-	  chase:'compra'
-	  
+	  chase:'compra',
+	  Ladder:'Modelo de renovación de cabeza de escalera'
     },
   },
   //意大利
@@ -1097,7 +1099,8 @@ export default {
       //个人功能
       thatPerson: "Funzioni personali",
       become: "Diventa un team leader",
-	  chase:'acquisto'
+	  chase:'acquisto',
+	  Ladder:'Negli ultimi anni si è registrato un aumento delle tasse di rinnovo'
     },
   },
 };

pageA/confirm.vue

@@ -6,7 +6,7 @@
 				mode=""></image>
 			<view class="success">{{i18n.Paymentsuccess}}</view>
 			<view class="order">{{i18n.MyOrder}}</view>
-			<view class="look">{{i18n.Vieworder}}</view>
+			<view class="look" @click="orderinfo">{{i18n.Vieworder}}</view>
 			<view class="index" @click="toindex">{{i18n.Backtohomepage}}</view>
 		</view>
 	</view>
@@ -25,6 +25,14 @@
 			}
 		},
 		methods: {
+			orderinfo() {
+				// uni.reLaunch({
+				// 	url: '/pageC/orderForm/orderForm?follow=' + ''
+				// })
+				uni.switchTab({
+					url:'/pages/mine/mine'
+				})
+			},
 			toindex() {
 				uni.switchTab({
 					url: '/pages/index/index'

pageA/counter.vue

@@ -158,7 +158,6 @@ color: rgba(34, 34, 34, 0.5);">补充体积预估费用更精确</text>
 			//商品类型
 			goodtype() {
 				uni.$u.http.get('/api/express-goods-type', ).then((res) => {
-					console.log(res);
 					this.goods = res
 				}).catch(() => {
 
@@ -191,7 +190,6 @@ color: rgba(34, 34, 34, 0.5);">补充体积预估费用更精确</text>
 						type: this.goodstype, //		是	String	商品类型: normal. 普通商品, special.特殊商品
 					}
 				}).then((res) => {
-					console.log(res);
 					this.money = res
 				}).catch(() => {
 
@@ -237,7 +235,7 @@ color: rgba(34, 34, 34, 0.5);">补充体积预估费用更精确</text>
 			//物流详情
 			logistics() {
 				uni.navigateTo({
-					url: '/pageA/logisticsinfo'
+					url: '/pageA/logisticsinfo?weight=' + this.value + '$money=' + this.money
 				})
 			},
 			//获取价格

pageA/logisticsinfo.vue

@@ -33,9 +33,14 @@
 	export default {
 		data() {
 			return {
-
+				weight:'',
+				monry:''
 			};
 		},
+		onLoad(options) {
+			this.weight = options.weight
+			this.money = options.money
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')

pageA/order.vue

@@ -161,7 +161,7 @@
 						<view class="logname" v-if="language =='es-ES'">{{item.name_es}}</view>
 						<view class="logname" v-if="language =='it-IT'">{{item.name_ita}}</view>
 						<!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
-						<view class="wei">¥{{item.unit_price}}/kg</view>
+						<view class="wei" style="font-size: 32rpx;font-weight: 600;">¥{{item.unit_price}}/kg</view>
 					</view>
 				</view>
 				<view class="nextto" @click="next">{{i18n.next}}</view>
@@ -199,7 +199,7 @@
 							</view>
 							<view class="mone">
 								<text>¥</text>
-								<text style="font-size: 32rpx;">{{item.sum}}</text>
+								<text style="font-size: 48rpx;font-weight: 600;">{{item.sum}}</text>
 							</view>
 						</view>
 					</view>
@@ -328,7 +328,7 @@
 			toadd() {
 				var that = this
 				uni.navigateTo({
-					url: '/pageC/addressManagement/addressManagement',
+					url: '/pageC/addressManagement/addressManagement?tabs='+ Number(0),
 					events: {
 						getadd(res) {
 							that.addinfo = res
@@ -353,15 +353,26 @@
 						height: this.goodinfo.height, //		是	String	高
 					}
 				}).then((res) => {
-					// this.containlist = res
-					this.containlist = []
-					res.forEach((item) => {
-						if (item.sum != 0) {
-							this.containlist.push(item)
-						}
-					})
-					this.sum = this.containlist[0].sum
-					this.unit_price = this.containlist[0].unit_price
+					console.log(res);
+					this.containlist = res
+					// this.containlist = []
+					// res.forEach((item) => {
+					// 	// if (item.sum != 0) {
+					// 		this.containlist.push(item)
+					// 	// }
+					// })
+					// this.sum = this.containlist[0].sum
+					// this.unit_price = this.containlist[0].unit_price
+					if(this.goodinfo.is_shipping==0){
+						this.sum = 0
+					}else{
+						this.sum = this.containlist[0].sum
+					}
+					if(this.goodinfo.is_shipping==0){
+						this.unit_price = 0
+					}else{
+						this.unit_price = this.containlist[0].unit_price
+					}
 					this.recommend_weight = this.containlist[0].recommend_weight
 					this.containid = this.containlist[0].id
 					if (this.language == 'zh-CN') {

pageA/payorder.vue

@@ -1,474 +1,396 @@
 <template>
-  <view class="back">
-    <view class="topbox">
-      <view class="" style="position: absolute; top: -30rpx; right: 0">
-        <view
-          class="state u-flex u-row-between"
-          @click="stateshow = !stateshow"
-        >
-          <text>{{ state }}</text>
-          <image
-            src="static/images/pull_down.png"
-            style="width: 24rpx; height: 24rpx"
-            mode=""
-          ></image>
-        </view>
-        <view class="state" v-if="stateshow">
-          <view
-            @click="statechange(item, idx)"
-            :class="state_id == idx ? 'stateac' : 'unstate'"
-            style="margin-bottom: 20rpx; font-size: 24rpx"
-            v-for="(item, idx) in array"
-            >{{ item.name }}
-          </view>
-        </view>
-      </view>
-      <view
-        class="u-row-center"
-        style="
+	<view class="back">
+		<view class="topbox">
+			<view class="" style="position: absolute; top: -30rpx; right: 0" v-if="pay_type == 'customer'">
+				<view class="state u-flex u-row-between" @click="stateshow = !stateshow">
+					<text>{{ state }}</text>
+					<image src="static/images/pull_down.png" style="width: 24rpx; height: 24rpx" mode=""></image>
+				</view>
+				<view class="state" v-if="stateshow">
+					<view @click="statechange(item, idx)" :class="state_id == idx ? 'stateac' : 'unstate'"
+						style="margin-bottom: 20rpx; font-size: 24rpx" v-for="(item, idx) in array">{{ item.name }}
+					</view>
+				</view>
+			</view>
+			<view class="u-row-center" style="
           display: flex;
           flex-direction: column;
           align-items: center;
           margin-top: 56rpx;
-        "
-      >
-        <view class="paysum">{{ i18n.Actual }}</view>
-        <view class="numbe" style="margin-top: 40rpx">
-          <text>￥</text>
-          <text style="font-size: 60rpx; font-weight: 500">{{ sum }}</text>
-        </view>
-        <!-- 				<view class="">
+        ">
+				<view class="paysum">{{ i18n.Actual }}</view>
+				<view class="numbe" style="margin-top: 40rpx">
+					<text v-if="state_id==0">￥</text>
+					<text v-if="state_id==1">$</text>
+					<text v-if="state_id==2">€</text>
+					<text v-if="state_id==3">￥</text>
+					<text style="font-size: 60rpx; font-weight: 600">{{ sum }}</text>
+				</view>
+				<!-- 				<view class="">
 					<text>支付剩余时间 13:50</text>
 				</view> -->
-      </view>
-      <!-- 余额支付 -->
-      <view
-        class="payitem"
-        style="margin-top: 100rpx; display: flex"
-        @click="change(0)"
-      >
-        <image
-          src="static/images/yuer.png"
-          mode=""
-          style="width: 40rpx; height: 40rpx"
-        ></image>
-        <view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
-          <view class="">
-            <view class="">{{ i18n.Balancepayment }}</view>
-            <view
-              class=""
-              style="margin-top: 10rpx; color: rgba(248, 50, 36, 1)"
-            >
-              {{ i18n.Currentbalance }}：{{ balance }}
-            </view>
-          </view>
-          <image
-            v-if="mode == 0"
-            src="static/images/active.png"
-            mode=""
-            style="width: 36rpx; height: 36rpx"
-          >
-          </image>
-          <image
-            v-else
-            src="static/images/unactive.png"
-            mode=""
-            style="width: 36rpx; height: 36rpx"
-          ></image>
-        </view>
-      </view>
-      <!-- 微信支付 -->
-      <view
-        v-if="state_id == 0"
-        class="payitem"
-        style="margin-top: 20rpx; display: flex"
-        @click="change(1)"
-      >
-        <image
-          src="static/images/wx.png"
-          mode=""
-          style="width: 40rpx; height: 40rpx"
-        ></image>
-        <view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
-          <view class="">
-            <view class="">{{ i18n.WechatPay }}</view>
-            <view
-              class=""
-              style="margin-top: 10rpx; color: rgba(121, 121, 121, 1)"
-            >
-              {{ i18n.applicable }}
-            </view>
-          </view>
-          <image
-            v-if="mode == 1"
-            src="static/images/active.png"
-            mode=""
-            style="width: 36rpx; height: 36rpx"
-          >
-          </image>
-          <image
-            v-else
-            src="static/images/unactive.png"
-            mode=""
-            style="width: 36rpx; height: 36rpx"
-          ></image>
-        </view>
-      </view>
-      <!-- 客服支付 -->
-      <view
-        class="payitem"
-        style="margin-top: 20rpx; display: flex"
-        @click="change(2)"
-      >
-        <image
-          src="static/images/kefu2.png"
-          mode=""
-          style="width: 40rpx; height: 40rpx"
-        ></image>
-        <view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
-          <view class="">
-            <view class="">{{ i18n.Customerservicepayment }}</view>
-            <view
-              class=""
-              style="margin-top: 10rpx; color: rgba(121, 121, 121, 1)"
-            >
-              {{ i18n.Contactpayment }}
-            </view>
-          </view>
-          <image
-            v-if="mode == 2"
-            src="static/images/active.png"
-            mode=""
-            style="width: 36rpx; height: 36rpx"
-          >
-          </image>
-          <image
-            v-else
-            src="static/images/unactive.png"
-            mode=""
-            style="width: 36rpx; height: 36rpx"
-          ></image>
-        </view>
-      </view>
-    </view>
-    <!-- 付款须知 -->
-    <view class="">
-      <view class="payment" style="margin-top: 24rpx">{{
+			</view>
+			<!-- 余额支付 -->
+			<view class="payitem" style="margin-top: 100rpx; display: flex" @click="change(0)">
+				<image src="static/images/yuer.png" mode="" style="width: 40rpx; height: 40rpx"></image>
+				<view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
+					<view class="">
+						<view class="">{{ i18n.Balancepayment }}</view>
+						<view class="" style="margin-top: 10rpx; color: rgba(248, 50, 36, 1);font-size: 24rpx;">
+							{{ i18n.Currentbalance }}：{{ balance }}
+						</view>
+					</view>
+					<image v-if="mode == 0" src="static/images/active.png" mode="" style="width: 36rpx; height: 36rpx">
+					</image>
+					<image v-else src="static/images/unactive.png" mode="" style="width: 36rpx; height: 36rpx"></image>
+				</view>
+			</view>
+			<!-- 微信支付 -->
+			<view class="payitem" style="margin-top: 20rpx; display: flex" @click="change(1)">
+				<image src="static/images/wx.png" mode="" style="width: 40rpx; height: 40rpx"></image>
+				<view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
+					<view class="">
+						<view class="">{{ i18n.WechatPay }}</view>
+						<view class="" style="margin-top: 10rpx; color: rgba(121, 121, 121, 1);font-size: 24rpx;">
+							{{ i18n.applicable }}
+						</view>
+					</view>
+					<image v-if="mode == 1" src="static/images/active.png" mode="" style="width: 36rpx; height: 36rpx">
+					</image>
+					<image v-else src="static/images/unactive.png" mode="" style="width: 36rpx; height: 36rpx"></image>
+				</view>
+			</view>
+			<!-- 客服支付 -->
+			<view class="payitem" style="margin-top: 20rpx; display: flex" @click="change(2)">
+				<image src="static/images/kefu2.png" mode="" style="width: 40rpx; height: 40rpx"></image>
+				<view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
+					<view class="">
+						<view class="">{{ i18n.Customerservicepayment }}</view>
+						<view class="" style="margin-top: 10rpx; color: rgba(121, 121, 121, 1);font-size: 24rpx;">
+							{{ i18n.Contactpayment }}
+						</view>
+					</view>
+					<image v-if="mode == 2" src="static/images/active.png" mode="" style="width: 36rpx; height: 36rpx">
+					</image>
+					<image v-else src="static/images/unactive.png" mode="" style="width: 36rpx; height: 36rpx"></image>
+				</view>
+			</view>
+		</view>
+		<!-- 付款须知 -->
+		<view class="" v-if="pay_type == 'customer'">
+			<view class="payment" style="margin-top: 24rpx">{{
         i18n.Paymentinstructions
       }}</view>
-      <view class="content" style="margin-top: 18rpx"
-        >1.联系客服付款需走线下支付通道，付款成</view
-      >
-    </view>
-    <view class="confirm" @click="confirm">
-      {{ i18n.Confirmpayment }}
-    </view>
-  </view>
+			<view class="content" style="margin-top: 18rpx">1.联系客服付款需走线下支付通道，付款成</view>
+		</view>
+		<view class="confirm" @click="confirm">
+			{{ i18n.Confirmpayment }}
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      mode: 0,
-      stateshow: false,
-      state: "人民币",
-      state_id: 0,
-      array: [
-        {
-          name: "人民币",
-        },
-        {
-          name: "欧元",
-        },
-        {
-          name: "美元",
-        },
-      ],
-      sum: "",
-      pay_type: "balance",
-      orderid: "",
-      balance: "",
-      type: "",
-      exchange_rate_id: "",
-      balance1: 0,
-      sum1: "",
-    };
-  },
-  onLoad(options) {
-    this.sum1 = options.sum;
-    this.sum = options.sum;
-    this.orderid = options.orderid;
-    if (options.type) {
-      this.type = options.type;
-    }
-  },
-  onShow() {
-    this.ratelist();
-    // this.userinfo()
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  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;
-      if (idx == 0) {
-        this.pay_type = "balance";
-      }
-      if (idx == 1) {
-        this.pay_type = "wechat";
-      }
-      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() {
-      // console.log(new Date().getTime());
-      if (this.type == "") {
-        uni.$u.http  
-          .post("/api/order/payment", {
-            order_id: this.orderid,
-            pay_type: this.pay_type,
-            customer_currency: "RMB",
-          })
-          .then((res) => {
-            console.log(res);
-            if (this.pay_type == "wechat") {
-              uni.requestPayment({
-                provider: "wxpay",
-                timeStamp: String(res.timeStamp),
-                nonceStr: res.nonceStr,
-                package: res.package,
-                signType: res.signType,
-                paySign: res.paySign,
-                success: function (res) {
-                  this.$u.toast("支付成功");
-                  console.log("success:" + JSON.stringify(res));
-                  setTimeout(() => {
-                    // uni.navigateTo({
-                    // 	url: "confirm",
-                    // });
-                  }, 800);
-                },
-                fail: function (err) {
-                  console.log("fail:" + JSON.stringify(err));
-                },
-                // success: (result) => {
-                //
-                // 	// console.log(result);
+	export default {
+		data() {
+			return {
+				mode: 0,
+				stateshow: false,
+				state: "人民币",
+				state_id: 0,
+				array: [{
+						name: "人民币",
+					},
+					{
+						name: "欧元",
+					},
+					{
+						name: "美元",
+					},
+				],
+				sum: "",
+				pay_type: "balance",
+				orderid: "",
+				balance: "",
+				type: "",
+				exchange_rate_id: "",
+				balance1: 0,
+				sum1: "",
+			};
+		},
+		onLoad(options) {
+			this.sum1 = options.sum;
+			this.sum = options.sum;
+			this.orderid = options.orderid;
+			if (options.type) {
+				this.type = options.type;
+			}
+		},
+		onShow() {
+			this.ratelist();
+			// this.userinfo()
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		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;
+				if (idx == 0) {
+					this.pay_type = "balance";
+				}
+				if (idx == 1) {
+					this.pay_type = "wechat";
+				}
+				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() {
+				// console.log(new Date().getTime());
+				if (this.type == "") {
+					uni.$u.http
+						.post("/api/order/payment", {
+							order_id: this.orderid,
+							pay_type: this.pay_type,
+							customer_currency: "RMB",
+						})
+						.then((res) => {
+							console.log(res);
+							if (this.pay_type == "wechat") {
+								uni.requestPayment({
+									provider: "wxpay",
+									timeStamp: String(res.timeStamp),
+									nonceStr: res.nonceStr,
+									package: res.package,
+									signType: res.signType,
+									paySign: res.paySign,
+									success: function(res) {
+										this.$u.toast("支付成功");
+										console.log("success:" + JSON.stringify(res));
+										setTimeout(() => {
+											uni.navigateTo({
+												url: "confirm",
+											});
+										}, 800);
+									},
+									fail: function(err) {
+										console.log("fail:" + JSON.stringify(err));
+									},
+									// success: (result) => {
+									//
+									// 	// console.log(result);
 
-                // },
-                // fail: (error) => {
-                // 	console.log(error);
-                // },
-              });
-            }
-          })
-          .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) => {
-            if (this.pay_type == "wechat") {
-              uni.requestPayment({
-                provider: "wxpay",
-                timeStamp: String(res.timeStamp),
-                nonceStr: res.nonceStr,
-                package: res.package,
-                signType: res.signType,
-                paySign: res.paySign,
-                success: function (res) {
-                  console.log("success:" + JSON.stringify(res));
-                  setTimeout(() => {
-                    uni.switchTab({
-                      url: "/pages/express/express",
-                    });
-                  }, 800);
-                },
-                fail: function (err) {
-                  console.log("fail:" + JSON.stringify(err));
-                },
-              });
-            } else {
-              this.$u.toast("支付成功");
-              setTimeout(() => {
-                uni.switchTab({
-                  url: "/pages/express/express",
-                });
-              }, 800);
-            }
-            // uni.navigateTo({
-            // 	url: 'confirm'
-            // })
-          })
-          .catch(() => {});
-      }
-    },
-  },
-};
+									// },
+									// fail: (error) => {
+									// 	console.log(error);
+									// },
+								});
+							}
+						})
+						.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) => {
+							if (this.pay_type == "wechat") {
+								uni.requestPayment({
+									provider: "wxpay",
+									timeStamp: String(res.timeStamp),
+									nonceStr: res.nonceStr,
+									package: res.package,
+									signType: res.signType,
+									paySign: res.paySign,
+									success: function(res) {
+										console.log("success:" + JSON.stringify(res));
+										setTimeout(() => {
+											uni.switchTab({
+												url: "/pages/express/express",
+											});
+										}, 800);
+									},
+									fail: function(err) {
+										console.log("fail:" + JSON.stringify(err));
+									},
+								});
+							} else {
+								this.$u.toast("支付成功");
+								setTimeout(() => {
+									uni.switchTab({
+										url: "/pages/express/express",
+									});
+								}, 800);
+							}
+							// uni.navigateTo({
+							// 	url: 'confirm'
+							// })
+						})
+						.catch(() => {});
+				}
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.payment {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 24rpx;
-  color: #222222;
-  line-height: 34rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.payment {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #222222;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.content {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #777777;
-  line-height: 28rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.content {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.stateac {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #ff1515;
-  line-height: 34rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.stateac {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #ff1515;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.unstate {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #222222;
-  line-height: 34rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.unstate {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #222222;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.confirm {
-  position: fixed;
-  bottom: 66rpx;
-  width: 702rpx;
-  height: 84rpx;
-  background: #f83224;
-  border-radius: 44rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #ffffff;
-  line-height: 84rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.confirm {
+		position: fixed;
+		bottom: 66rpx;
+		width: 702rpx;
+		height: 84rpx;
+		background: #f83224;
+		border-radius: 44rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #ffffff;
+		line-height: 84rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.payitem {
-  width: 702rpx;
-  height: 140rpx;
-  background: #ffffff;
-  border-radius: 12rpx;
-  padding: 34rpx 24rpx;
-  box-sizing: border-box;
-}
+	.payitem {
+		width: 702rpx;
+		height: 140rpx;
+		background: #ffffff;
+		border-radius: 12rpx;
+		padding: 34rpx 24rpx;
+		box-sizing: border-box;
+	}
 
-.back {
-  padding: 20rpx 24rpx;
-  box-sizing: border-box;
+	.back {
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
 
-  .topbox {
-    position: relative;
+		.topbox {
+			position: relative;
 
-    .state {
-      width: 128rpx;
-      // height: 56rpx;
-      background: #ffffff;
-      border-radius: 6rpx;
-      padding: 12rpx;
-      box-sizing: border-box;
-    }
+			.state {
+				// width: 128rpx;
+				// height: 56rpx;
+				background: #ffffff;
+				border-radius: 6rpx;
+				padding: 12rpx;
+				box-sizing: border-box;
+			}
 
-    .paysum {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #222222;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.paysum {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .numbe {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 28rpx;
-      color: #000000;
-      line-height: 38rpx;
-      text-align: left;
-      font-style: normal;
-      margin-top: 20rpx;
-    }
-  }
-}
-</style>
+			.numbe {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 28rpx;
+				color: #000000;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+				margin-top: 20rpx;
+			}
+		}
+	}
+</style>

pageA/productdetails.vue

@@ -143,7 +143,7 @@
 					<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="title" style="width: 600;">{{ 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" />
@@ -151,10 +151,10 @@
 							</view>
 							<view class="" style="margin-top: 20rpx"></view>
 							<view class="u-flex" style="margin-top: 20rpx">
-								<text class="num">{{ i18n.Salesvolume }} 2384w+</text>
+								<text class="num">{{ i18n.Salesvolume }} {{goodinfo.merchant.sale_num}}</text>
 								<view class="line"></view>
 								<!-- 评价总数 -->
-								<text class="num">{{ i18n.Salesvolume }} 2384w+</text>
+								<text class="num">{{ i18n.review }} {{goodinfo.merchant.comment_num}}</text>
 							</view>
 						</view>
 					</view>
@@ -165,12 +165,12 @@
 					<view class="title">
 						{{ i18n.Recommended }}
 					</view>
-					<view class="">
+					<view class="" style="margin-top: 10rpx;">
 						<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 :src="child.image" style="width: 214rpx; height: 214rpx;border-radius: 10rpx;" mode="">
 										</image>
 										<view class="over" style="
                         width: 214rpx;
@@ -216,7 +216,7 @@
 				</view>
 				<view class="recommend" id="scroll2">
 					<view class="title">{{ i18n.Productdetails }}</view>
-					<view class="" style="margin-top: 32rpx; margin-bottom: 28rpx">{{
+					<view class="" style="margin-top: 32rpx; margin-bottom: 28rpx;font-size: 26rpx;">{{
             i18n.Specification
           }}</view>
 					<view class="specification">

pageB/end.vue

@@ -63,7 +63,7 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
 						</view>
-<!-- 						<view class="u-flex" @click.stop="addbook(0)">
+						<!-- 						<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> -->
@@ -90,7 +90,7 @@
 							</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> -->
@@ -145,7 +145,8 @@
 				container_id: '',
 				unit_price: '',
 				number: '',
-				sum: ""
+				sum: "",
+				code:''
 			}
 		},
 		onLoad(options) {
@@ -181,12 +182,14 @@
 					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. 特殊商品
+					domestic_logistics_company_code:this.code
 				}).then((res) => {
 					console.log(res)
 					this.$u.toast('下单成功')
 					setTimeout(() => {
 						uni.navigateTo({
-							url: '/pageB/orderinfo?orderinfo=' + encodeURIComponent(JSON.stringify(res))
+							url: '/pageB/orderinfo?orderinfo=' + encodeURIComponent(JSON.stringify(
+								res))
 						})
 					})
 					// uni.navigateTo({
@@ -201,7 +204,9 @@
 					url: '/pageB/expresstype',
 					events: {
 						todcp: (res) => {
-							this.expname = res
+							console.log(res)
+							this.expname = res.concant
+							this.code = res.code
 						}
 					}
 				})

pageB/expresstype.vue

@@ -4,7 +4,7 @@
 			<u-radio-group v-model="radiovalue1" placement="column" @change="groupChange">
 				<view class="item u-flex u-row-between" v-for="(item,idx) in radiolist1" :key="idx">
 					<text>{{item.name}}</text>
-					<u-radio :name="item.name" @change="radioChange">
+					<u-radio :name="item.name" @change="radioChange(item)">
 					</u-radio>
 				</view>
 			</u-radio-group>
@@ -21,23 +21,9 @@
 	export default {
 		data() {
 			return {
-				concant:'',
-				radiolist1: [{
-						name: '顺丰标快',
-						disabled: false
-					},
-					{
-						name: '中通快递',
-						disabled: false
-					},
-					{
-						name: '韵达快递',
-						disabled: false
-					}, {
-						name: '圆通快递',
-						disabled: false
-					}
-				],
+				concant: '',
+				code: '',
+				radiolist1: [],
 			};
 		},
 		computed: {
@@ -45,10 +31,23 @@
 				return this.$t('index')
 			}
 		},
+		onLoad() {
+			this.getlist()
+		},
 		methods: {
+			getlist() {
+				uni.$u.http.get('/api/express-company', {}).then((res) => {
+					this.radiolist1 = res
+				}).catch(() => {
+
+				})
+			},
 			toteach() {
 				const eventChannel = this.getOpenerEventChannel();
-				eventChannel.emit('todcp', this.concant);
+				eventChannel.emit('todcp', {
+					'concant': this.concant,
+					'code': this.code
+				});
 				uni.navigateBack()
 			},
 			groupChange(n) {
@@ -56,7 +55,8 @@
 			},
 			radioChange(n) {
 				console.log('radioChange', n);
-				this.concant = n
+				this.concant = n.name
+				this.code = n.name
 			}
 		}
 	}

pageB/orderinfo.vue

@@ -1,10 +1,11 @@
 <template>
 	<view class="back">
+		<u-navbar :title="i18n.Vieworder" @leftClick="leftClick" :autoBack='false'>
+		</u-navbar>
 		<view class="top u-flex u-row-between">
 			<text class="success">{{i18n.successful}}</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=='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"
@@ -18,13 +19,10 @@
 				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=='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>
+			<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;">
@@ -39,7 +37,7 @@
 			</view>
 			<view class="" style="margin: 44rpx 0;">
 				<view class="u-flex">
-					<image src="/static/express/ji.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
+					<image src="/static/express/shou.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
 					<text class="name" style="margin-left: 28rpx;">{{orderinfo.transit_name}}</text>
 					<text class="name" style="margin-left: 12rpx;">{{orderinfo.transit_mobile}}</text>
 				</view>
@@ -71,12 +69,20 @@
 		onLoad(options) {
 			this.orderinfo = JSON.parse(decodeURIComponent(options.orderinfo));
 			console.log(this.orderinfo);
+			this.$u.toast(this.i18n.successful + this.i18n.MyOrder)
 		},
 		computed: {
 			i18n() {
 				return this.$t('index')
 			}
 		},
+		methods: {
+			leftClick() {
+				uni.switchTab({
+					url: '/pages/mine/mine'
+				})
+			}
+		}
 	}
 </script>
 

pageC/addressManagement/addressManagement.vue

@@ -39,6 +39,9 @@
 				addressList: [],
 			};
 		},
+		onLoad(options) {
+			this.manage = options.tabs
+		},
 		computed: {
 			i18n() {
 				return this.$t("index");

pages.json

@@ -291,7 +291,8 @@
 					"style" : 
 					{
 						"navigationBarTitleText" : "订单详情",
-						"enablePullDownRefresh" : false
+						"enablePullDownRefresh" : false,
+						"navigationStyle": "custom"
 					}
 				},
 				{

pages/index/index.vue

@@ -277,10 +277,7 @@
 				this.current = options.current
 			}
 			//商品推荐
-			this.recommend()
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
+
 
 		},
 		onShow() {
@@ -293,6 +290,10 @@
 			this.pack()
 			//海外包邮
 			this.shipp()
+			this.recommend()
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
 		},
 		methods: {
 			callphone() {