冲突

commont/messages.js

@@ -357,7 +357,9 @@ export default {
 			logisticsMethod: '请选择物流方式',
 			selectCourier: '请选择快递公司',
 			trackingNumber: '请填写快递单号',
-			parcelWeight: '请填写包裹重量'
+			parcelWeight: '请填写包裹重量',
+			
+			
 		},
 	},
 	//英语

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "kjds",
-    "appid" : "__UNI__F715804",
+    "appid" : "__UNI__AF78173",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pageA/comment.vue

@@ -13,22 +13,24 @@
 								class="name">{{item.member.nickname.slice(0,1)+'***'+item.member.nickname.slice(-1)}}</text>
 							<!-- 	<uni-rate  allow-half :readonly="true" color="rgba(247, 181, 0, 1)" :size='8'
 								:value="item.score" :max="5" /> -->
-							<uni-rate :max="5" :value="item.score" :readonly="true" 
-								:size='8' />
+							<uni-rate :max="5" :value="item.score" :readonly="true" :size='8' />
 						</view>
 					</view>
 					<text class="day">{{timeSince(item.created_at)}}</text>
 				</view>
-				<view class="day" style="margin-top: 24rpx;">{{item.sku_item.item}}</view>
+				<view v-if="item.sku_item" class="day" style="margin-top: 24rpx;">{{item.sku_item.item}}</view>
 				<view class="content" style="margin-top: 20rpx;">{{item.content}}</view>
 				<!-- <view class="" v-for="(child,index) in item.image.split(',')" :key="index" style="margin-top: 22rpx;"> -->
-				<view class="u-flex u-row-between" style="margin-top: 22rpx;flex-wrap: wrap;"
-					v-if="item.image || item.video">
-					<video :src="item.video"
-						style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;"></video>
-					<image v-for="(child,index) in item.image.split(',')" :key="index" :src="child"
-						style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;background: #D8D8D8;"
-						mode=""></image>
+				<view class="u-flex u-row-between" style="margin-top: 22rpx;flex-wrap: wrap;">
+					<view class="" v-if=" item.video">
+						<video v-for="(child,inde) in item.video.split(',')" :src="child" :key="inde"
+							style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;"></video>
+					</view>
+					<view class="" v-if="item.image ">
+						<image v-for="(child,index) in item.image.split(',')" :key="index" :src="child"
+							style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;background: #D8D8D8;"
+							mode=""></image>
+					</view>
 				</view>
 			</view>
 		</view>

pageA/payorder.vue

@@ -1,698 +1,611 @@
 <template>
-  <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"
-          >
-            <text v-if="language == 'zh-CN'">
-              {{ item.name_cn }}
-            </text>
-            <text v-if="language == 'en-US'">
-              {{ item.name_en }}
-            </text>
-            <text v-if="language == 'es-ES'">
-              {{ item.name_es }}
-            </text>
-            <text v-if="language == 'it-IT'">
-              {{ item.name_ita }}
-            </text>
-          </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">
+						<text v-if="language == 'zh-CN'">
+							{{ item.name_cn }}
+						</text>
+						<text v-if="language == 'en-US'">
+							{{ item.name_en }}
+						</text>
+						<text v-if="language == 'es-ES'">
+							{{ item.name_es }}
+						</text>
+						<text v-if="language == 'it-IT'">
+							{{ item.name_ita }}
+						</text>
+					</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 v-if="state_id == 0 && mode == 2">￥</text>
-          <text v-if="state_id == 1 && mode == 2">$</text>
-          <text v-if="state_id == 2 && mode == 2">€</text>
-          <text v-if="state_id == 3 && mode == 2">￥</text>
-          <text v-if="mode != 2">￥</text>
-          <text style="font-size: 60rpx; font-weight: 600" v-if="mode == 2">{{
+        ">
+				<view class="paysum">{{ i18n.Actual }}</view>
+				<view class="numbe" style="margin-top: 40rpx">
+					<text v-if="state_id == 0 && mode == 2">￥</text>
+					<text v-if="state_id == 1 && mode == 2">$</text>
+					<text v-if="state_id == 2 && mode == 2">€</text>
+					<text v-if="state_id == 3 && mode == 2">￥</text>
+					<text v-if="mode != 2">￥</text>
+					<text style="font-size: 60rpx; font-weight: 600" v-if="mode == 2">{{
             sum
           }}</text>
-          <text style="font-size: 60rpx; font-weight: 600" v-else>{{
+					<text style="font-size: 60rpx; font-weight: 600" v-else>{{
             sum1
           }}</text>
-        </view>
-        <!-- 				<view class="">
+				</view>
+				<!-- 				<view class="">
 					<text>支付剩余时间 13:50</text>
 				</view> -->
-      </view>
-      <!-- 缴纳保证金 -->
-      <view
-        v-if="orderType == 'bond'"
-        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.Marginpayment }}</view>
-            <view
-              class=""
-              style="
+			</view>
+			<!-- 缴纳保证金 -->
+			<view v-if="orderType == 'bond'" 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.Marginpayment }}</view>
+						<view class="" style="
                 margin-top: 10rpx;
                 color: rgba(248, 50, 36, 1);
                 font-size: 24rpx;
-              "
-            >
-              {{ i18n.Currentbalance }}:
-              {{ bondBalance }}
-            </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-else
-        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
-              v-if="mode == 2"
-              class=""
-              style="
+              ">
+							{{ i18n.Currentbalance }}:
+							{{ bondBalance }}
+						</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-else 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 v-if="mode == 2" class="" style="
                 margin-top: 10rpx;
                 color: rgba(248, 50, 36, 1);
                 font-size: 24rpx;
-              "
-            >
-              {{ i18n.Currentbalance }}：{{ balance }}
-            </view>
-            <view
-              v-else
-              class=""
-              style="
+              ">
+							{{ i18n.Currentbalance }}：{{ balance }}
+						</view>
+						<view v-else class="" style="
                 margin-top: 10rpx;
                 color: rgba(248, 50, 36, 1);
                 font-size: 24rpx;
-              "
-            >
-              {{ i18n.Currentbalance }}：{{ balance1 }}
-            </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="orderType != 'bond'"
-        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="
+              ">
+							{{ i18n.Currentbalance }}：{{ balance1 }}
+						</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="orderType != 'bond'" 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
-        v-if="orderType != 'bond'"
-        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="
+              ">
+							{{ 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 v-if="orderType != 'bond'" 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.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;margin-bottom: 18rpx;font-size: 32rpx;">{{
         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> -->
+			<u-parse :content="content" style="margin-top: 18rpx"></u-parse>
+		</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: [],
-      sum: "",
-      pay_type: "balance",
-      orderid: "",
-      balance: "",
-      type: "",
-      exchange_rate_id: "",
-      balance1: 0,
-      sum1: "",
-      language: "zh-CN",
-      orderType: "",
-      bondBalance: "",
-    };
-  },
-  onLoad(options) {
-    this.sum1 = options.sum;
-    this.sum = options.sum;
-    this.orderid = options.orderid;
-    this.orderType = options.orderType;
-    if (options.type) {
-      this.type = options.type;
-    }
-  },
-  onShow() {
-    this.ratelist();
-    // this.userinfo()
-    if (uni.getStorageSync("language") != "") {
-      this.language = uni.getStorageSync("language");
-    }
-  },
-  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.bondBalance = res.deposit;
-          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;
-          if (this.language == "zh-CN") {
-            this.state = this.array[0].name_cn;
-          }
-          if (this.language == "en-US") {
-            this.state = this.array[0].name_en;
-          }
-          if (this.language == "es-ES") {
-            this.state = this.array[0].name_es;
-          }
-          if (this.language == "it-IT") {
-            this.state = this.array[0].name_ita;
-          }
-          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) {
-      if (this.language == "zh-CN") {
-        this.state = item.name_cn;
-      }
-      if (this.language == "en-US") {
-        this.state = item.name_en;
-      }
-      if (this.language == "es-ES") {
-        this.state = item.name_es;
-      }
-      if (this.language == "it-IT") {
-        this.state = item.name_ita;
-      }
-      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.orderType == "difference") {
-        //补差额
-        uni.$u.http
-          .post(`/api/order/fill`, {
-            order_id: this.orderid,
-            pay_type: this.pay_type,
-          })
-          .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) {
-                  this.$u.toast(this.i18n.Paymentsuccess);
-                  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: [],
+				sum: "",
+				pay_type: "balance",
+				orderid: "",
+				balance: "",
+				type: "",
+				exchange_rate_id: "",
+				balance1: 0,
+				sum1: "",
+				language: "zh-CN",
+				orderType: "",
+				bondBalance: "",
+				content:''
+			};
+		},
+		onLoad(options) {
+			this.sum1 = options.sum;
+			this.sum = options.sum;
+			this.orderid = options.orderid;
+			this.orderType = options.orderType;
+			if (options.type) {
+				this.type = options.type;
+			}
+			
+		},
+		onShow() {
+			this.ratelist();
+			// this.userinfo()
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
+			this.reminder()
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		methods: {
+			//协议
+			reminder(){
+				uni.$u.http.get(`/api/agreement?code=Payment instructions`).then((res) => {
+					console.log(res);
+					if(this.language =='zh-CN'){
+						// this.name = res.name_cn
+						this.content = res.content_cn
+					}else if(this.language =='en-US'){
+						// this.name = res.name_en
+						this.content = res.content_en
+					}else if(this.language =='es-ES'){
+						// this.name = res.name_es
+						this.content = res.content_es
+					}else if(this.language =='it-IT'){
+						// this.name = res.name_ita
+						this.content = res.content_ita
+					}
+				});
+			},
+			//用户信息
+			userinfo() {
+				uni.$u.http
+					.get("/api/member/info", {})
+					.then((res) => {
+						this.balance = res.balance;
+						this.balance1 = this.balance;
+						this.bondBalance = res.deposit;
+						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;
+						if (this.language == "zh-CN") {
+							this.state = this.array[0].name_cn;
+						}
+						if (this.language == "en-US") {
+							this.state = this.array[0].name_en;
+						}
+						if (this.language == "es-ES") {
+							this.state = this.array[0].name_es;
+						}
+						if (this.language == "it-IT") {
+							this.state = this.array[0].name_ita;
+						}
+						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) {
+				if (this.language == "zh-CN") {
+					this.state = item.name_cn;
+				}
+				if (this.language == "en-US") {
+					this.state = item.name_en;
+				}
+				if (this.language == "es-ES") {
+					this.state = item.name_es;
+				}
+				if (this.language == "it-IT") {
+					this.state = item.name_ita;
+				}
+				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.orderType == "difference") {
+					//补差额
+					uni.$u.http
+						.post(`/api/order/fill`, {
+							order_id: this.orderid,
+							pay_type: this.pay_type,
+						})
+						.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) {
+										this.$u.toast(this.i18n.Paymentsuccess);
+										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);
-                // },
-              });
-            }
-            uni.showToast({
-              title: this.i18n.Paymentsuccess,
-              icon: "none",
-            });
-            //一秒钟之后返回上一页
-            let timer = setTimeout(() => {
-              uni.navigateBack({
-                delta: 1,
-              });
-              clearTimeout(timer);
-            }, 1000);
-          });
-        return;
-      } else if (this.orderType == "bond") {
-        //支付保证金
-        uni.$u.http
-          .post(`/api/order/earnest_pay`, {
-            order_id: this.orderid,
-          })
-          .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) {
-                  this.$u.toast("支付成功");
-                  console.log("success:" + JSON.stringify(res));
-                  setTimeout(() => {
-                    uni.navigateTo({
-                      url: "confirm",
-                    });
-                  }, 800);
-                },
-                fail: function (err) {
-                  console.log("fail:" + JSON.stringify(err));
-                },
-              });
-            }
-            //提示支付成功
-            uni.showToast({
-              title: "支付成功",
-              icon: "none",
-            });
-            //一秒钟之后返回上一页
-            let timer = setTimeout(() => {
-              uni.navigateBack({
-                delta: 1,
-              });
-              clearTimeout(timer);
-            }, 1000);
-          });
-        return;
-      }
-      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(this.i18n.Paymentsuccess);
-                  console.log("success:" + JSON.stringify(res));
-                  setTimeout(() => {
-                    uni.navigateTo({
-                      url: "/pageA/confirm",
-                    });
-                  }, 800);
-                },
-                fail: function (err) {
-                  console.log("fail:" + JSON.stringify(err));
-                },
-                // success: (result) => {
-                //
-                // 	// console.log(result);
+									// },
+									// fail: (error) => {
+									// 	console.log(error);
+									// },
+								});
+							}
+							uni.showToast({
+								title: this.i18n.Paymentsuccess,
+								icon: "none",
+							});
+							//一秒钟之后返回上一页
+							let timer = setTimeout(() => {
+								uni.navigateBack({
+									delta: 1,
+								});
+								clearTimeout(timer);
+							}, 1000);
+						});
+					return;
+				} else if (this.orderType == "bond") {
+					//支付保证金
+					uni.$u.http
+						.post(`/api/order/earnest_pay`, {
+							order_id: this.orderid,
+						})
+						.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) {
+										this.$u.toast("支付成功");
+										console.log("success:" + JSON.stringify(res));
+										setTimeout(() => {
+											uni.navigateTo({
+												url: "confirm",
+											});
+										}, 800);
+									},
+									fail: function(err) {
+										console.log("fail:" + JSON.stringify(err));
+									},
+								});
+							}
+							//提示支付成功
+							uni.showToast({
+								title: "支付成功",
+								icon: "none",
+							});
+							//一秒钟之后返回上一页
+							let timer = setTimeout(() => {
+								uni.navigateBack({
+									delta: 1,
+								});
+								clearTimeout(timer);
+							}, 1000);
+						});
+					return;
+				}
+				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(this.i18n.Paymentsuccess);
+										console.log("success:" + JSON.stringify(res));
+										setTimeout(() => {
+											uni.navigateTo({
+												url: "/pageA/confirm",
+											});
+										}, 800);
+									},
+									fail: function(err) {
+										console.log("fail:" + JSON.stringify(err));
+									},
+									// success: (result) => {
+									//
+									// 	// console.log(result);
 
-                // },
-                // fail: (error) => {
-                // 	console.log(error);
-                // },
-              });
-            } else {
-              this.$u.toast(this.i18n.Paymentsuccess);
-              setTimeout(() => {
-                uni.navigateTo({
-                  url: "/pageA/confirm",
-                });
-              }, 800);
-            }
+									// },
+									// fail: (error) => {
+									// 	console.log(error);
+									// },
+								});
+							} else {
+								this.$u.toast(this.i18n.Paymentsuccess);
+								setTimeout(() => {
+									uni.navigateTo({
+										url: "/pageA/confirm",
+									});
+								}, 800);
+							}
 
-            uni.showToast({
-              title: this.i18n.Paymentsuccess,
-              icon: "none",
-            });
-            uni.navigateBack({
-              delta: 1,
-            });
-          })
-          .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(this.i18n.Paymentsuccess);
-              setTimeout(() => {
-                uni.switchTab({
-                  url: "/pages/express/express",
-                });
-              }, 800);
-            }
-            // uni.navigateTo({
-            // 	url: 'confirm'
-            // })
-          })
-          .catch(() => {});
-      }
-    },
-  },
-};
+							uni.showToast({
+								title: this.i18n.Paymentsuccess,
+								icon: "none",
+							});
+							uni.navigateBack({
+								delta: 1,
+							});
+						})
+						.catch(() => {});
+				} else {
+					uni.$u.http
+						.post("/api/pay", {
+							order_id: this.orderid,
+							pay_type: this.mode == 2 ? 'customer_service' : 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(this.i18n.Paymentsuccess);
+								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>

pageB/ParcelExpress.vue

@@ -14,7 +14,7 @@
 			</u-navbar>
 			<view class="entrepot">
 				<view class="entre u-flex u-row-between">
-					<view class="" style="width: 520rpx;" >
+					<view class="" style="width: 520rpx;">
 						<text class='bigtitle' v-if="expressinfo.type=='normal'">{{i18n.Ordinary}}</text>
 						<text class='bigtitle' v-else>{{i18n.Special}}</text>
 						<text style="margin: 0 8rpx;">|</text>
@@ -147,7 +147,8 @@
 			  position: relative;
 			  border-radius: 20rpx 20rpx 0 0;
 			">
-					<view class="" style="text-align: center;font-size: 30rpx;font-weight: 600;margin-bottom: 20rpx;">{{contenttitle}}</view>
+					<view class="" style="text-align: center;font-size: 30rpx;font-weight: 600;margin-bottom: 20rpx;">
+						{{contenttitle}}</view>
 					<u-parse :content="content"></u-parse>
 				</view>
 			</u-popup>
@@ -185,7 +186,7 @@
 			}
 		},
 		methods: {
-			changeji(){
+			changeji() {
 				uni.navigateBack()
 			},
 			close() {
@@ -195,7 +196,7 @@
 				// this.internationalshow = true
 				// this.international()
 				uni.navigateTo({
-					url:'/pageB/xieyi?code=' + 'international_express_service'
+					url: '/pageB/xieyi?code=' + 'international_express_service'
 				})
 			},
 			//国际快递服务协议
@@ -242,7 +243,7 @@
 			addbook(index) {
 				var that = this
 				uni.navigateTo({
-					url: "/pageC/addressManagement/addressManagement?index=" + index,
+					url: "/pageC/addressManagement/addressManagement?tabs=" + index,
 					events: {
 						getadd(res) {
 							if (index == 1) {
@@ -259,13 +260,13 @@
 			},
 			//物品信息
 			goods() {
-				if(JSON.stringify(this.topadd)=="{}"){
+				if (JSON.stringify(this.topadd) == "{}") {
 					this.$u.toast(this.i18n.informat)
-					return 
+					return
 				}
-				if(JSON.stringify(this.bottomadd)=="{}"){
+				if (JSON.stringify(this.bottomadd) == "{}") {
 					this.$u.toast(this.i18n.informate)
-					return 
+					return
 				}
 				var that = this
 				if (JSON.stringify(this.goodinfo) == '{}') {
@@ -302,9 +303,27 @@
 			},
 			//寄件人信息
 			send() {
-				uni.navigateTo({
-					url: '/pageB/Senderinfor'
-				})
+				var that = this
+				if (JSON.stringify(that.topadd) == '{}') {
+					uni.navigateTo({
+						url: '/pageC/addEditAddress/addEditAddress',
+						events: {
+							topadd: function(res) {
+								that.topadd = res
+							}
+						}
+					})
+				} else {
+					var that = this
+					uni.navigateTo({
+						url: '/pageC/addEditAddress/addEditAddress?id=' + that.topadd.id,
+						events: {
+							topadd: function(res) {
+								that.topadd = res
+							}
+						}
+					})
+				}
 			},
 			recipirnt() {
 				uni.navigateTo({

pageB/delivery.vue

@@ -267,7 +267,7 @@
 			addbook(index) {
 				var that = this
 				uni.navigateTo({
-					url: "/pageC/addressManagement/addressManagement?index=" + index,
+					url: "/pageC/addressManagement/addressManagement?tabs=" + index,
 					events: {
 						getadd(res) {
 							if (index == 1) {

pageB/end.vue

@@ -221,7 +221,7 @@
 			addbook(index) {
 				var that = this
 				uni.navigateTo({
-					url: "/pageC/addressManagement/addressManagement?index=" + index,
+					url: "/pageC/addressManagement/addressManagement?tabs=" + index,
 					events: {
 						getadd(res) {
 							if (index == 1) {

pageC/accountCancellation/accountCancellation.vue

@@ -1,14 +1,13 @@
 <template>
 	<view class="page">
 
-		<view style="margin-bottom: 40rpx;">在注销账户前，请您进行以下风险确认:</view>
+		<view style="margin-bottom: 40rpx;">{{name}}</view>
 
-		<view> 1.请您注意在【我-钱包]中确认您是否存在尚未使用或提现的余额、优惠券等权益，我们建议您在注销前妥当处理您的资产，例如提现至银行卡、使用相关权益等。</view>
-		<view> 2.请您务必审慎阅读关于您权益的重要提示，确保在您注销账号时已处理完毕权益。</view>
+		<u-parse :content="content"></u-parse>
 		<button @click="show = true" class="btn">注销账号</button>
-		<view class="cancellation">
+<!-- 		<view class="cancellation">
 			注销后账户不可恢复，请谨慎操作
-		</view>
+		</view> -->
 		<u-modal :buttonReverse='true' :showCancelButton='true' @cancel='show = false' @confirm='logout'
 			:confirmText='i18n.enter' :cancelText='i18n.Cancel' :show="show" :title="i18n.accountCancellation" :content='i18n.closeaccount'
 			confirmColor='#606266' cancelColor='#2979ff'></u-modal>
@@ -24,6 +23,20 @@
 				// content: '确定要注销账号吗？',
 				// confirmText: '确定',
 				// cancelText: '取消'
+				name:'',
+				content:'',
+				language :'zh-CN'
+			}
+		},
+		onLoad() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.accountCancellation
+			})
+			this.reminder()
+		},
+		onshow(){
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
 			}
 		},
 		computed: {
@@ -32,11 +45,34 @@
 			}
 		},
 		methods: {
+			//协议
+			reminder(){
+				uni.$u.http.get(`/api/agreement?code=cancellation_reminder`).then((res) => {
+					console.log(res);
+					if(this.language =='zh-CN'){
+						this.name = res.name_cn
+						this.content = res.content_cn
+					}else if(this.language =='en-US'){
+						this.name = res.name_en
+						this.content = res.content_en
+					}else if(this.language =='es-ES'){
+						this.name = res.name_es
+						this.content = res.content_es
+					}else if(this.language =='it-IT'){
+						this.name = res.name_ita
+						this.content = res.content_ita
+					}
+				});
+			},
 			logout() {
-				this.show = false
+				uni.$u.http.get(`/api/member/freeze`).then((res) => {
+					// console.log(res);
+					this.$u.toast('注销成功')
+					this.show = false
+				});
 			}
 		}
-	}
+	}  
 </script>
 
 <style scoped lang="scss">

pageC/orderForm/component/orderInofrmation.vue

@@ -135,9 +135,9 @@
       <button
         class="status-2"
         v-if="itemInfo.order.simplify_status == 'finished'"
-        @click.stop="$emit('toEvaluate', itemInfo)"
+        @click="$emit('toDetail', itemInfo)"
       >
-        评价
+        去评价
       </button>
       <u-transition :show="show">
         <view class="transition" @click.stop="$emit('deleteOrder', itemInfo)"

pageC/orderFormDetail/component/commodityDetail.vue

@@ -1,316 +1,310 @@
 <template>
-  <view class="detail">
-    <view v-for="item in orderDetail.goods" :key="item.id">
-      <view class="title">
-        <view class="title-left">
-          <image class="header-img" :src="item.merchant.image" mode=""></image>
-          <text>{{ item.merchant.merchant_name }}</text>
-          <image
-            class="right-325"
-            src="../../../static/mine/325.png"
-            mode=""
-          ></image>
-        </view>
-      </view>
-      <view class="commodity-information">
-        <view class="commodity-1">
-          <image
-            class="commodity-img"
-            :src="item.sku_item.image"
-            mode=""
-          ></image>
-          <view class="">
-            <view class="commodity-2">
-              <view class="commodity-title">{{ item.goods_name }} </view>
-              <view class="commodity-price">
-                <text style="font-size: 20rpx">￥</text>
-                <text>{{ item.discount_price.split(".")[0] }}</text
-                >.
-                <text style="font-size: 20rpx">{{
-                  item.discount_price.split(".")[1]
-                }}</text>
-              </view>
-            </view>
+	<view class="detail">
+		<view v-for="item in orderDetail.goods" :key="item.id">
+			<view class="title">
+				<view class="title-left">
+					<image class="header-img" :src="item.merchant.image" mode=""></image>
+					<text>{{ item.merchant.merchant_name }}</text>
+					<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+				</view>
+			</view>
+			<view class="commodity-information">
+				<view class="commodity-1">
+					<image class="commodity-img" :src="item.sku_item.image" mode=""></image>
+					<view class="" style="height: 180rpx;display: flex;flex-direction: column;justify-content: space-between;">
+						<view class="">
+							<view class="commodity-2">
+								<view class="commodity-title">{{ item.goods_name }} </view>
+								<view class="commodity-price">
+									<text style="font-size: 20rpx">￥</text>
+									<text>{{ item.discount_price.split(".")[0] }}</text>.
+									<text style="font-size: 20rpx">{{
+				        item.discount_price.split(".")[1]
+				      }}</text>
+								</view>
+							</view>
+							<view class="commodity-3">
+								<view class="specifications"> {{ item.sku_item.item }} </view>
+								<view style="font-size: 24rpx"> x{{ item.goods_num }} </view>
+							</view>
+						</view>
+						<view v-if="orderDetail.simplify_status == 'finished'" class="" style="display: flex;justify-content: space-between;">
+							<view class=""></view>
+							<view @click="toping(item)" class="" style="border: #f83224 solid 2rpx;min-width: 80rpx;height: 40rpx;line-height: 40rpx;color: #f83224;border-radius: 20rpx;text-align: center;">  
+								评价
+							</view>
+						</view>
+					</view>
+				</view>
 
-            <view class="commodity-3">
-              <view class="specifications"> {{ item.sku_item.item }} </view>
-              <view style="font-size: 24rpx"> x{{ item.goods_num }} </view>
-            </view>
-          </view>
-        </view>
-
-        <view
-          class="btn-list"
-          v-if="
+				<view class="btn-list" v-if="
             orderDetail.simplify_status == 'paid' ||
             orderDetail.simplify_status == 'undelivered' ||
             orderDetail.simplify_status == 'unreview' ||
             orderDetail.simplify_status == 'merdelivered'
-          "
-        >
-          <!-- status就是 状态 0未审核 1已通过 2未通过 3平台介入 -->
-          <button
-            @click="platformIntervene(item)"
-            v-if="
+          ">
+					<!-- status就是 状态 0未审核 1已通过 2未通过 3平台介入 -->
+					<button @click="platformIntervene(item)" v-if="
               item.refund &&
               (item.refund.status == 2 ||
                 item.refund.status == 0 ||
                 item.refund.status == 3)
-            "
-          >
-            平台介入
-          </button>
-          <button
-            @click="toRefundDetail(item)"
-            v-if="
+            ">
+						平台介入
+					</button>
+					<button @click="toRefundDetail(item)" v-if="
               item.refund &&
               (item.refund.status == 0 ||
                 item.refund.status == 1 ||
                 item.refund.status == 2 ||
                 item.refund.status == 3)
-            "
-          >
-            退款详情
-          </button>
-          <button
-            @click="application(item)"
-            v-if="item.refund && item.refund.status == 2"
-          >
-            继续申请
-          </button>
-          <button v-if="!item.refund" @click="application(item)">
-            申请退款
-          </button>
-        </view>
-      </view>
-    </view>
-    <view class="information">
-      <text class="_label">商品总价</text>
-      <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
-        <text style="font-size: 20rpx">￥</text>
-        <text>{{ orderDetail.goods_amount.split(".")[0] }}</text
-        >.
-        <text style="font-size: 20rpx">{{
+            ">
+						退款详情
+					</button>
+					<button @click="application(item)" v-if="item.refund && item.refund.status == 2">
+						继续申请
+					</button>
+					<button v-if="!item.refund" @click="application(item)">
+						申请退款
+					</button>
+				</view>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">商品总价</text>
+			<view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
+				<text style="font-size: 20rpx">￥</text>
+				<text>{{ orderDetail.goods_amount.split(".")[0] }}</text>.
+				<text style="font-size: 20rpx">{{
           orderDetail.goods_amount.split(".")[1]
         }}</text>
-      </view>
-    </view>
-    <view class="information">
-      <text class="_label">商品总重量</text>
-      <view class="_title-right"> {{ orderDetail.weight_total || 0 }}Kg </view>
-    </view>
-    <view class="information">
-      <text class="_label">跨境物流</text>
-      <view lass="_title-right">
-        {{ orderDetail.container.transport_type.name_cn }} |
-        {{ orderDetail.container.name_cn }}
-      </view>
-    </view>
-    <view class="information last">
-      <text class="_label">运费</text>
-      <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
-        <text style="font-size: 20rpx">￥</text>
-        <text>{{ orderDetail.freight.split(".")[0] }}</text
-        >.
-        <text style="font-size: 20rpx">{{
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">商品总重量</text>
+			<view class="_title-right"> {{ orderDetail.weight_total || 0 }}Kg </view>
+		</view>
+		<view class="information">
+			<text class="_label">跨境物流</text>
+			<view lass="_title-right">
+				{{ orderDetail.container.transport_type.name_cn }} |
+				{{ orderDetail.container.name_cn }}
+			</view>
+		</view>
+		<view class="information last">
+			<text class="_label">运费</text>
+			<view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
+				<text style="font-size: 20rpx">￥</text>
+				<text>{{ orderDetail.freight.split(".")[0] }}</text>.
+				<text style="font-size: 20rpx">{{
           orderDetail.freight.split(".")[1]
         }}</text>
-      </view>
-    </view>
-    <view class="_bottom">
-      <text class="_label">应付款 </text>
-      <view
-        style="color: #f83224; margin-left: 10rpx; font-weight: 600"
-        v-if="orderDetail.amount"
-      >
-        <text style="font-size: 20rpx">￥</text>
-        <text>{{ orderDetail.amount.split(".")[0] }}</text
-        >.
-        <text style="font-size: 20rpx">{{
+			</view>
+		</view>
+		<view class="_bottom">
+			<text class="_label">应付款 </text>
+			<view style="color: #f83224; margin-left: 10rpx; font-weight: 600" v-if="orderDetail.amount">
+				<text style="font-size: 20rpx">￥</text>
+				<text>{{ orderDetail.amount.split(".")[0] }}</text>.
+				<text style="font-size: 20rpx">{{
           orderDetail.amount.split(".")[1]
         }}</text>
-      </view>
-    </view>
-  </view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import textRight from "../../accountSecurity/component/textRight.vue";
-export default {
-  components: {
-    textRight,
-  },
-  props: {
-    status: {
-      typeof: Number,
-      default: 0,
-    },
-    orderDetail: {
-      typeof: Object,
-      default: () => {
-        return {};
-      },
-    },
-  },
-  data() {
-    return {};
-  },
-  methods: {
-    //申请退款
-    application(value) {
-      uni.navigateTo({
-        url: `/pageC/applicationRefund/applicationRefund?orderId=${value.id}`,
-      });
-    },
+	import textRight from "../../accountSecurity/component/textRight.vue";
+	export default {
+		components: {
+			textRight,
+		},
+		props: {
+			status: {
+				typeof: Number,
+				default: 0,
+			},
+			orderDetail: {
+				typeof: Object,
+				default: () => {
+					return {};
+				},
+			},
+		},
+		data() {
+			return {};
+		},
+		methods: {
+			//评论
+			toping(item){
+				console.log(item);
+				uni.navigateTo({
+					url:'/pageD/evaluate/evaluate?goods='+JSON.stringify(item)
+				})
+			},
+			//申请退款
+			application(value) {
+				uni.navigateTo({
+					url: `/pageC/applicationRefund/applicationRefund?orderId=${value.id}`,
+				});
+			},
 
-    //售后订单详情
-    toRefundDetail(value) {
-      uni.navigateTo({
-        url: `/pageC/refundDetail/refundDetail?orderId=${value.refund.id}`,
-      });
-    },
+			//售后订单详情
+			toRefundDetail(value) {
+				uni.navigateTo({
+					url: `/pageC/refundDetail/refundDetail?orderId=${value.refund.id}`,
+				});
+			},
 
-    //申请平台介入
-    platformIntervene(value) {
-      if (value.refund.status != 3) {
-        uni.$u.http
-          .post(`/api/order_refund/platform_intervention`, {
-            order_refund_id: value.refund.id,
-          })
-          .then((res) => {
-            uni.showToast({
-              title: "已申请平台介入",
-              icon: "none",
-            });
-          });
-      } else {
-        uni.showToast({
-          title: "平台已介入",
-          icon: "none",
-        });
-      }
-    },
-  },
-};
+			//申请平台介入
+			platformIntervene(value) {
+				if (value.refund.status != 3) {
+					uni.$u.http
+						.post(`/api/order_refund/platform_intervention`, {
+							order_refund_id: value.refund.id,
+						})
+						.then((res) => {
+							uni.showToast({
+								title: "已申请平台介入",
+								icon: "none",
+							});
+						});
+				} else {
+					uni.showToast({
+						title: "平台已介入",
+						icon: "none",
+					});
+				}
+			},
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-.detail {
-  padding: 28rpx 20rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  margin-top: 28rpx;
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 20rpx;
+
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
+
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
+
+		.commodity-information {
+			margin-top: 28rpx;
+
+			.commodity-1 {
+				display: flex;
 
-  .title {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 20rpx;
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
 
-    .title-left {
-      display: flex;
-      font-size: 32rpx;
-      align-items: center;
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
 
-      .header-img {
-        width: 36rpx;
-        height: 36rpx;
-        border-radius: 50%;
-        margin-right: 20rpx;
-      }
+					.commodity-title {
+						width: 328rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-right: 38rpx;
+					}
+				}
 
-      .right-325 {
-        width: 32rpx;
-        height: 32rpx;
-      }
-    }
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
 
-    .order-status {
-      color: #f83224;
-      font-size: 26rpx;
-    }
-  }
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+			}
+		}
 
-  .commodity-information {
-    margin-top: 28rpx;
+		.last {
+			border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+			padding-bottom: 20rpx;
+		}
 
-    .commodity-1 {
-      display: flex;
+		.btn-list {
+			display: flex;
+			justify-content: flex-end;
 
-      .commodity-img {
-        width: 180rpx;
-        height: 180rpx;
-        margin-right: 20rpx;
-        border-radius: 10rpx;
-      }
+			button {
+				width: 152rpx;
+				height: 58rpx;
+				border: 2rpx solid #979797;
+				color: #444;
+				margin: 0;
+				padding: 0;
+				font-size: 24rpx;
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin-top: 20rpx;
+				margin-left: 20rpx;
+			}
+		}
 
-      .commodity-2 {
-        display: flex;
-        justify-content: space-between;
+		.information {
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin: 34rpx 0;
 
-        .commodity-title {
-          width: 328rpx;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          margin-right: 38rpx;
-        }
-      }
+			._label {
+				font-size: 28rpx;
+				color: #333;
+			}
 
-      .commodity-3 {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 20rpx;
-        color: #777;
+			._title-right {
+				font-size: 28rpx;
+				color: #333;
+			}
+		}
 
-        .specifications {
-          font-size: 28rpx;
-          color: #777;
-        }
-      }
-    }
-  }
-  .last {
-    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-    padding-bottom: 20rpx;
-  }
-  .btn-list {
-    display: flex;
-    justify-content: flex-end;
-    button {
-      width: 152rpx;
-      height: 58rpx;
-      border: 2rpx solid #979797;
-      color: #444;
-      margin: 0;
-      padding: 0;
-      font-size: 24rpx;
-      background-color: #fff;
-      border-radius: 34rpx;
-      margin-top: 20rpx;
-      margin-left: 20rpx;
-    }
-  }
-  .information {
-    display: flex;
-    justify-content: space-between;
-    font-size: 28rpx;
-    align-items: flex-end;
-    margin: 34rpx 0;
-    ._label {
-      font-size: 28rpx;
-      color: #333;
-    }
-    ._title-right {
-      font-size: 28rpx;
-      color: #333;
-    }
-  }
-  ._bottom {
-    display: flex;
-    justify-content: flex-end;
-    font-size: 28rpx;
-    align-items: flex-end;
-    margin-top: 34rpx;
-  }
-}
-</style>
+		._bottom {
+			display: flex;
+			justify-content: flex-end;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin-top: 34rpx;
+		}
+	}
+</style>

pageC/orderFormDetail/orderFormDetail.vue

@@ -197,13 +197,13 @@
       >
         再来一单
       </button>
-      <button
+<!--      <button
         class="status-2"
         v-if="orderDetail.simplify_status == 'finished'"
         @click.stop="toEvaluate"
       >
         评价
-      </button>
+      </button> -->
       <button
         class="status-2"
         v-if="orderDetail.simplify_status == 'undifference'"

pageD/evaluate/evaluate.vue

@@ -9,13 +9,11 @@
 				<view class="_label"> 商品评价 </view>
 				<u-rate :count="count" v-model="value" size="22"></u-rate>
 			</view>
-			<view class="">{{item.list}}</view>
-
 			<!-- accept="all" 可以上传视频是配置该字段 -->
-
-			<!-- 			<u-upload :fileList="item.list" @afterRead="afterRead" @delete="deletePic" :name="idx" multiple
+			<!-- 			<u-upload :previewFullImage='true' @clickPreview="openvideo" accept="all" :fileList="item.list" @afterRead="afterRead" @delete="deletePic" :name="idx" multiple
 				:maxCount="10"> -->
-			<u-upload :fileList="fileList0" @afterRead="afterRead" @delete="deletePic" name="0" multiple :maxCount="10">
+			<u-upload :fileList="fileList0" @afterRead="afterRead" @delete="deletePic" name="0" multiple :maxCount="10"
+				accept="all">
 				<view class="upload-photo">
 					<u-icon name="camera" size="26"></u-icon>
 					<text>添加图片/视频</text>
@@ -38,20 +36,36 @@
 				value: 5,
 				value1: "",
 				status: "",
-				orderDetail: {},
-				fileList0: []
+				orderDetail: {
+					goods:[]
+				},
+				fileList0: [],
+				goods_name: ''
 			};
 		},
 		onLoad(options) {
 			this.status = options.orderId;
-			this.getDetail();
+			console.log(JSON.parse(options.goods));
+			this.orderDetail.goods.push(JSON.parse(options.goods))
+			console.log(this.orderDetail.goods);
+			// this.getDetail();
 		},
 		methods: {
+			openvideo(url, lists, name) {
+				console.log(url, lists, name);
+			},
 			//提交评价
 			submit() {
 				let imgList = [];
-				this.fileList1.map((item) => {
-					imgList.push(item.thumb);
+				let videoList = []
+				this.fileList0.map((item) => {
+					console.log(item);
+					if (item.url.slice(-4) == '.png' || item.url.slice(-4) == '.jpg'){
+						imgList.push(item.url);
+					}
+					if (item.url.slice(-4) == '.mp4'){
+						videoList.push(item.url);
+					}
 				});
 				uni.$u.http
 					.post(`/api/order/comment`, {
@@ -59,7 +73,7 @@
 						content: this.value1,
 						score: this.value,
 						image: imgList.join(","),
-						video: "",
+						video: videoList.join(","),
 					})
 					.then((res) => {
 						uni.showToast({
@@ -75,41 +89,59 @@
 					});
 			},
 			// 删除图片
-			// deletePic(event) {
-			// 	this[`fileList${event.name}`].splice(event.index, 1);
-			// },
 			deletePic(event) {
-				this.orderDetail.goods[event.name].list.splice(event.index, 1);
+				this[`fileList${event.name}`].splice(event.index, 1);
 			},
+			// deletePic(event) {
+			// 	this.orderDetail.goods[event.name].list.splice(event.index, 1);
+			// 	//触发响应式
+			// 	let name = this.orderDetail.goods[event.name].goods_name + " "
+			// 	this.orderDetail.goods[event.name].goods_name = name.substring(-2)
+			// },
 			// async afterRead(event) {
 			// 	console.log(event);
+			// 	var that = this
 			// 	let lists = [].concat(event.file);
-			// 	let imglist = this.orderDetail.goods[event.name].list
-			// 	let fileListLen = this.orderDetail.goods[event.name].list.length;
+			// 	let imglist = [].concat(that.orderDetail.goods[event.name].list)
+			// 	let fileListLen = that.orderDetail.goods[event.name].list.length;
 			// 	// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
-			// 	lists.map((item) => {
-			// 		this.orderDetail.goods[event.name].list.push({
-			// 			...item,
-			// 			status: "uploading",
-			// 			message: "上传中",
-			// 		});
+			// 	// lists.map((item) => {
+			// 	// 	this.orderDetail.goods[event.name].list.push({
+			// 	// 		...item,
+			// 	// 		status: "uploading",
+			// 	// 		message: "上传中",
+			// 	// 	});
+			// 	// });
+
+			// 	that.orderDetail.goods[event.name].list.push({
+			// 		...event.file[0],
+			// 		status: "uploading",
+			// 		message: "上传中",
 			// 	});
-			// 	console.log('list1', this.orderDetail.goods[event.name].list);
-			// 	for (let i = 0; i < lists.length; i++) {
-			// 		const result = await this.uploadFilePromise(this.orderDetail.goods[event.name].list[i].url);
-			// 		let item = this.orderDetail.goods[event.name].list[fileListLen];
-			// 		this.orderDetail.goods[event.name].list.splice(
-			// 			fileListLen,
-			// 			1,
-			// 			Object.assign(item, {
-			// 				status: "success",
-			// 				message: "",
-			// 				url: result,
-			// 			})
-			// 		);
-			// 		fileListLen++;
-			// 	}
-			// 	console.log('list2', this.orderDetail.goods[event.name].list);
+			// 	console.log(that.orderDetail.goods[event.name].list);
+			// 	// console.log()
+			// 	const result = await that.uploadFilePromise(event.file[0].url);
+			// 	console.log(result);
+			// 	let item = that.orderDetail.goods[event.name].list[fileListLen];
+			// 	that.orderDetail.goods[event.name].list.splice(
+			// 		fileListLen,
+			// 		1,
+			// 		Object.assign(item, {
+			// 			status: "success",
+			// 			message: "",
+			// 			url: result,
+			// 		})
+			// 	);
+			// 	let imgs = [].concat(that.orderDetail.goods[event.name].list)
+			// 	// that.$set(that.orderDetail.goods[event.name],"list",imgs)
+			// 	this.$set(that.orderDetail.goods[event.name], "length", imgs.length)
+			// 	that.orderDetail.goods[event.name].length = imgs.length
+			// 	that.orderDetail.goods[event.name].list = imgs
+
+
+			// 	//触发响应式
+			// 	let name = that.orderDetail.goods[event.name].goods_name + " "
+			// 	that.orderDetail.goods[event.name].goods_name = name.substring(-2)
 			// },
 			// 新增图片
 			async afterRead(event) {
@@ -141,6 +173,7 @@
 				}
 			},
 			uploadFilePromise(url) {
+				console.log(url);
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
 						url: `${uni.$u.http.config.baseURL}/api/upload/images`, // 仅为示例，非真实的接口地址
@@ -151,8 +184,8 @@
 						},
 						success: (res) => {
 							setTimeout(() => {
-								// resolve(JSON.parse(res.data).data.filePath);
-								resolve(res.data.data);
+								resolve(JSON.parse(res.data).data.filePath);
+								// resolve(res.data.data);  
 							}, 1000);
 						},
 					});
@@ -163,6 +196,7 @@
 					this.orderDetail = res;
 					this.orderDetail.goods.forEach((item) => {
 						item.list = []
+						item.length = 0
 					})
 					console.log(this.orderDetail);
 				});
@@ -177,6 +211,11 @@
 </script>
 
 <style lang="scss" scoped>
+	::v-deep .u-upload__wrap__preview__image {
+		width: 180rpx;
+		height: 180rpx;
+	}
+
 	.content {
 		background-color: #fff;
 		padding: 40rpx 24rpx;

pages/index/index.vue

@@ -84,7 +84,7 @@
 												style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
 												mode="">
 											</image>
-											<text>已补</text>
+											<text>{{i18n.fill}}</text>
 											<text>{{(item.price*1000 - item.discount_price*1000)/1000 + i18n.RMB}}</text>
 										</view>
 									</view>

uni_modules/uview-ui/components/u-upload/u-upload.vue

@@ -1,122 +1,58 @@
 <template>
 	<view class="u-upload" :style="[$u.addStyle(customStyle)]">
-		<view class="u-upload__wrap" >
+		<view class="u-upload__wrap">
 			<template v-if="previewImage">
-				<view
-				    class="u-upload__wrap__preview"
-				    v-for="(item, index) in lists"
-				    :key="index"
-				>
-					<image
-					    v-if="item.isImage || (item.type && item.type === 'image')"
-					    :src="item.thumb || item.url"
-					    :mode="imageMode"
-					    class="u-upload__wrap__preview__image"
-					    @tap="onPreviewImage(item)"
-						:style="[{
+				<view class="u-upload__wrap__preview" v-for="(item, index) in lists" :key="index">
+					<image v-if="item.isImage || (item.type && item.type === 'image')" :src="item.thumb || item.url"
+						:mode="imageMode" class="u-upload__wrap__preview__image" @tap="onPreviewImage(item)" :style="[{
 							width: $u.addUnit(width),
 							height: $u.addUnit(height)
-						}]"
-					/>
-					<view
-					    v-else
-					    class="u-upload__wrap__preview__other"
-					>
-						<u-icon
-						    color="#80CBF9"
-						    size="26"
-						    :name="item.isVideo || (item.type && item.type === 'video') ? 'movie' : 'folder'"
-						></u-icon>
-						<text class="u-upload__wrap__preview__other__text">{{item.isVideo || (item.type && item.type === 'video') ? '视频' : '文件'}}</text>
+						}]" />
+					<view @tap="toast(item)" v-else class="u-upload__wrap__preview__other">
+						<u-icon color="#80CBF9" size="26"
+							:name="item.isVideo || (item.type && item.type === 'video') ? 'movie' : 'folder'"></u-icon>
+						<text
+							class="u-upload__wrap__preview__other__text">{{item.isVideo || (item.type && item.type === 'video') ? '视频' : '文件'}}</text>
 					</view>
-					<view
-					    class="u-upload__status"
-					    v-if="item.status === 'uploading' || item.status === 'failed'"
-					>
+					<view class="u-upload__status" v-if="item.status === 'uploading' || item.status === 'failed'">
 						<view class="u-upload__status__icon">
-							<u-icon
-							    v-if="item.status === 'failed'"
-							    name="close-circle"
-							    color="#ffffff"
-							    size="25"
-							/>
-							<u-loading-icon
-							    size="22"
-							    mode="circle"
-							    color="#ffffff"
-							    v-else
-							/>
+							<u-icon v-if="item.status === 'failed'" name="close-circle" color="#ffffff" size="25" />
+							<u-loading-icon size="22" mode="circle" color="#ffffff" v-else />
 						</view>
-						<text
-						    v-if="item.message"
-						    class="u-upload__status__message"
-						>{{ item.message }}</text>
+						<text v-if="item.message" class="u-upload__status__message">{{ item.message }}</text>
 					</view>
-					<view
-					    class="u-upload__deletable"
-					    v-if="item.status !== 'uploading' && (deletable || item.deletable)"
-					    @tap.stop="deleteItem(index)"
-					>
+					<view class="u-upload__deletable"
+						v-if="item.status !== 'uploading' && (deletable || item.deletable)"
+						@tap.stop="deleteItem(index)">
 						<view class="u-upload__deletable__icon">
-							<u-icon
-							    name="close"
-							    color="#ffffff"
-							    size="10"
-							></u-icon>
+							<u-icon name="close" color="#ffffff" size="10"></u-icon>
 						</view>
 					</view>
-					<view
-					    class="u-upload__success"
-					    v-if="item.status === 'success'"
-					>
+					<view class="u-upload__success" v-if="item.status === 'success'">
 						<!-- #ifdef APP-NVUE -->
-						<image
-						    :src="successIcon"
-						    class="u-upload__success__icon"
-						></image>
+						<image :src="successIcon" class="u-upload__success__icon"></image>
 						<!-- #endif -->
 						<!-- #ifndef APP-NVUE -->
 						<view class="u-upload__success__icon">
-							<u-icon
-							    name="checkmark"
-							    color="#ffffff"
-							    size="12"
-							></u-icon>
+							<u-icon name="checkmark" color="#ffffff" size="12"></u-icon>
 						</view>
 						<!-- #endif -->
 					</view>
 				</view>
-				
+
 			</template>
-			
+
 			<template v-if="isInCount">
-				<view
-				    v-if="$slots.default || $slots.$default"
-				    @tap="chooseFile"
-				>
+				<view v-if="$slots.default || $slots.$default" @tap="chooseFile">
 					<slot />
 				</view>
-				<view
-				    v-else
-				    class="u-upload__button"
-				    :hover-class="!disabled ? 'u-upload__button--hover' : ''"
-				    hover-stay-time="150"
-				    @tap="chooseFile"
-				    :class="[disabled && 'u-upload__button--disabled']"
-					:style="[{
+				<view v-else class="u-upload__button" :hover-class="!disabled ? 'u-upload__button--hover' : ''"
+					hover-stay-time="150" @tap="chooseFile" :class="[disabled && 'u-upload__button--disabled']" :style="[{
 						width: $u.addUnit(width),
 						height: $u.addUnit(height)
-					}]"
-				>
-					<u-icon
-					    :name="uploadIcon"
-					    size="26"
-					    :color="uploadIconColor"
-					></u-icon>
-					<text
-					    v-if="uploadText"
-					    class="u-upload__button__text"
-					>{{ uploadText }}</text>
+					}]">
+					<u-icon :name="uploadIcon" size="26" :color="uploadIconColor"></u-icon>
+					<text v-if="uploadText" class="u-upload__button__text">{{ uploadText }}</text>
 				</view>
 			</template>
 		</view>
@@ -166,7 +102,7 @@
 	 */
 	export default {
 		name: "u-upload",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, mixin,props],
+		mixins: [uni.$u.mpMixin, uni.$u.mixin, mixin, props],
 		data() {
 			return {
 				// #ifdef APP-NVUE
@@ -186,6 +122,9 @@
 			},
 		},
 		methods: {
+			toast(item) {
+				uni.$u.toast('视频不支持预览')
+			},
 			formatFileList() {
 				const {
 					fileList = [], maxCount
@@ -213,7 +152,7 @@
 				let capture;
 				try {
 					capture = uni.$u.test.array(this.capture) ? this.capture : this.capture.split(',');
-				}catch(e) {
+				} catch (e) {
 					capture = [];
 				}
 				chooseFile(
@@ -311,7 +250,8 @@
 				if (!item.isImage || !this.previewFullImage) return
 				uni.previewImage({
 					// 先filter找出为图片的item，再返回filter结果中的图片url
-					urls: this.lists.filter((item) => this.accept === 'image' || uni.$u.test.image(item.url || item.thumb)).map((item) => item.url || item.thumb),
+					urls: this.lists.filter((item) => this.accept === 'image' || uni.$u.test.image(item.url || item
+						.thumb)).map((item) => item.url || item.thumb),
 					current: item.url || item.thumb,
 					fail() {
 						uni.$u.toast('预览图片失败')
@@ -358,55 +298,55 @@
 	@import '../../libs/css/components.scss';
 	$u-upload-preview-border-radius: 2px !default;
 	$u-upload-preview-margin: 0 8px 8px 0 !default;
-	$u-upload-image-width:80px !default;
-	$u-upload-image-height:$u-upload-image-width;
+	$u-upload-image-width: 80px !default;
+	$u-upload-image-height: $u-upload-image-width;
 	$u-upload-other-bgColor: rgb(242, 242, 242) !default;
-	$u-upload-other-flex:1 !default;
-	$u-upload-text-font-size:11px !default;
-	$u-upload-text-color:$u-tips-color !default;
-	$u-upload-text-margin-top:2px !default;
-	$u-upload-deletable-right:0 !default;
-	$u-upload-deletable-top:0 !default;
-	$u-upload-deletable-bgColor:rgb(55, 55, 55) !default;
-	$u-upload-deletable-height:14px !default;
-	$u-upload-deletable-width:$u-upload-deletable-height;
-	$u-upload-deletable-boder-bottom-left-radius:100px !default;
-	$u-upload-deletable-zIndex:3 !default;
-	$u-upload-success-bottom:0 !default;
-	$u-upload-success-right:0 !default;
-	$u-upload-success-border-style:solid !default;
-	$u-upload-success-border-top-color:transparent !default;
-	$u-upload-success-border-left-color:transparent !default;
+	$u-upload-other-flex: 1 !default;
+	$u-upload-text-font-size: 11px !default;
+	$u-upload-text-color: $u-tips-color !default;
+	$u-upload-text-margin-top: 2px !default;
+	$u-upload-deletable-right: 0 !default;
+	$u-upload-deletable-top: 0 !default;
+	$u-upload-deletable-bgColor: rgb(55, 55, 55) !default;
+	$u-upload-deletable-height: 14px !default;
+	$u-upload-deletable-width: $u-upload-deletable-height;
+	$u-upload-deletable-boder-bottom-left-radius: 100px !default;
+	$u-upload-deletable-zIndex: 3 !default;
+	$u-upload-success-bottom: 0 !default;
+	$u-upload-success-right: 0 !default;
+	$u-upload-success-border-style: solid !default;
+	$u-upload-success-border-top-color: transparent !default;
+	$u-upload-success-border-left-color: transparent !default;
 	$u-upload-success-border-bottom-color: $u-success !default;
-	$u-upload-success-border-right-color:$u-upload-success-border-bottom-color;
-	$u-upload-success-border-width:9px !default;
-	$u-upload-icon-top:0px !default;
-	$u-upload-icon-right:0px !default;
-	$u-upload-icon-h5-top:1px !default;
-	$u-upload-icon-h5-right:0 !default;
-	$u-upload-icon-width:16px !default;
-	$u-upload-icon-height:$u-upload-icon-width;
-	$u-upload-success-icon-bottom:-10px !default;
-	$u-upload-success-icon-right:-10px !default;
-	$u-upload-status-right:0 !default;
-	$u-upload-status-left:0 !default;
-	$u-upload-status-bottom:0 !default;
-	$u-upload-status-top:0 !default;
-	$u-upload-status-bgColor:rgba(0, 0, 0, 0.5) !default;
-	$u-upload-status-icon-Zindex:1 !default;
-	$u-upload-message-font-size:12px !default;
-	$u-upload-message-color:#FFFFFF !default;
-	$u-upload-message-margin-top:5px !default;
-	$u-upload-button-width:80px !default;
-	$u-upload-button-height:$u-upload-button-width;
-	$u-upload-button-bgColor:rgb(244, 245, 247) !default;
-	$u-upload-button-border-radius:2px !default;
+	$u-upload-success-border-right-color: $u-upload-success-border-bottom-color;
+	$u-upload-success-border-width: 9px !default;
+	$u-upload-icon-top: 0px !default;
+	$u-upload-icon-right: 0px !default;
+	$u-upload-icon-h5-top: 1px !default;
+	$u-upload-icon-h5-right: 0 !default;
+	$u-upload-icon-width: 16px !default;
+	$u-upload-icon-height: $u-upload-icon-width;
+	$u-upload-success-icon-bottom: -10px !default;
+	$u-upload-success-icon-right: -10px !default;
+	$u-upload-status-right: 0 !default;
+	$u-upload-status-left: 0 !default;
+	$u-upload-status-bottom: 0 !default;
+	$u-upload-status-top: 0 !default;
+	$u-upload-status-bgColor: rgba(0, 0, 0, 0.5) !default;
+	$u-upload-status-icon-Zindex: 1 !default;
+	$u-upload-message-font-size: 12px !default;
+	$u-upload-message-color: #FFFFFF !default;
+	$u-upload-message-margin-top: 5px !default;
+	$u-upload-button-width: 80px !default;
+	$u-upload-button-height: $u-upload-button-width;
+	$u-upload-button-bgColor: rgb(244, 245, 247) !default;
+	$u-upload-button-border-radius: 2px !default;
 	$u-upload-botton-margin: 0 8px 8px 0 !default;
-	$u-upload-text-font-size:11px !default;
-	$u-upload-text-color:$u-tips-color !default;
+	$u-upload-text-font-size: 11px !default;
+	$u-upload-text-color: $u-tips-color !default;
 	$u-upload-text-margin-top: 2px !default;
-	$u-upload-hover-bgColor:rgb(230, 231, 233) !default;
-	$u-upload-disabled-opacity:.5 !default;
+	$u-upload-hover-bgColor: rgb(230, 231, 233) !default;
+	$u-upload-disabled-opacity: .5 !default;
 
 	.u-upload {
 		@include flex(column);
@@ -555,4 +495,4 @@
 			}
 		}
 	}
-</style>
+</style>

unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.wxss

@@ -1 +1 @@
-.all.data-v-13d5b46b{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-13d5b46b{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .dle.data-v-13d5b46b{width:136rpx;height:60rpx;text-align:center;line-height:60rpx;border-radius:38rpx;border:2rpx solid #979797;font-size:26rpx;color:#333}.bottom .allweight.data-v-13d5b46b{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-13d5b46b{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-13d5b46b{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-13d5b46b{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.all.data-v-0e4880d5{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-0e4880d5{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .dle.data-v-0e4880d5{width:136rpx;height:60rpx;text-align:center;line-height:60rpx;border-radius:38rpx;border:2rpx solid #979797;font-size:26rpx;color:#333}.bottom .allweight.data-v-0e4880d5{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-0e4880d5{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-0e4880d5{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-0e4880d5{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}

unpackage/dist/build/mp-weixin/pageA/balance.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"038d":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}}}},"2ecb":function(e,n,t){"use strict";t.r(n);var u=t("038d"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=a.a},4470:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},a=[]},7055:function(e,n,t){"use strict";t.r(n);var u=t("4470"),a=t("2ecb");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);var r=t("828b"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=i.exports},c9be:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("7055"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["c9be","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"0148":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u},"2a70":function(e,n,t){"use strict";t.r(n);var u=t("0148"),a=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(r);n["default"]=a.a},5536:function(e,n,t){"use strict";t.r(n);var u=t("cdee"),a=t("2a70");for(var r in a)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(r);var c,f=t("f0c5"),i=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},5605:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var a=u(t("5536"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},cdee:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var a=function(){var e=this,n=e.$createElement;e._self._c},r=[]}},[["5605","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/common/vendor.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/common/vendor"],{"2bad":function(e,t,o){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.readablizeBytes=function(e){var t=Math.floor(Math.log(e)/Math.log(1024));return(e/Math.pow(1024,Math.floor(t))).toFixed(2)+" "+["Bytes","KB","MB","GB","TB","PB"][t]},t.renderTime=function(e){var t=new Date(parseInt(e)),o=(t.getFullYear(),t.getMonth()+1<10?"0"+(t.getMonth()+1):t.getMonth()+1),n=t.getDate()<10?"0"+t.getDate():t.getDate(),a=t.getHours()<10?"0"+t.getHours():t.getHours(),g=t.getMinutes()<10?"0"+t.getMinutes():t.getMinutes();t.getSeconds(),t.getSeconds();return"".concat(o,"-").concat(n," ").concat(a,":").concat(g)}}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/common/vendor"],{fbb8:function(e,t,o){"use strict";function n(e){var t=new Date(parseInt(e)),o=(t.getFullYear(),t.getMonth()+1<10?"0"+(t.getMonth()+1):t.getMonth()+1),n=t.getDate()<10?"0"+t.getDate():t.getDate(),a=t.getHours()<10?"0"+t.getHours():t.getHours(),g=t.getMinutes()<10?"0"+t.getMinutes():t.getMinutes();t.getSeconds(),t.getSeconds();return"".concat(o,"-").concat(n," ").concat(a,":").concat(g)}function a(e){var t=["Bytes","KB","MB","GB","TB","PB"],o=Math.floor(Math.log(e)/Math.log(1024));return(e/Math.pow(1024,Math.floor(o))).toFixed(2)+" "+t[o]}Object.defineProperty(t,"__esModule",{value:!0}),t.readablizeBytes=a,t.renderTime=n}}]);

unpackage/dist/build/mp-weixin/pageA/confirm.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{"10a7":function(n,e,t){"use strict";t.r(e);var r=t("5e18"),u=t("53f3");for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);t("586e");var c=t("828b"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"95fe1fe2",null,!1,r["a"],void 0);e["default"]=i.exports},"29cd":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{orderinfo:function(){n.reLaunch({url:"/pageC/orderForm/orderForm"})},toindex:function(){n.switchTab({url:"/pages/index/index"})}}};e.default=t}).call(this,t("df3c")["default"])},"53f3":function(n,e,t){"use strict";t.r(e);var r=t("29cd"),u=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(a);e["default"]=u.a},"586e":function(n,e,t){"use strict";var r=t("a4b0"),u=t.n(r);u.a},"5e18":function(n,e,t){"use strict";t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){}));var r=function(){var n=this.$createElement;this._self._c},u=[]},a4b0:function(n,e,t){},fdd5:function(n,e,t){"use strict";(function(n,e){var r=t("47a9");t("abeb");r(t("3240"));var u=r(t("10a7"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["fdd5","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{6491:function(n,e,t){"use strict";t.r(e);var r=t("92df"),u=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(a);e["default"]=u.a},"68df":function(n,e,t){"use strict";var r;t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},a=[]},"6e3d":function(n,e,t){"use strict";t.r(e);var r=t("68df"),u=t("6491");for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);t("731b");var f,c=t("f0c5"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"95fe1fe2",null,!1,r["a"],f);e["default"]=i.exports},"731b":function(n,e,t){"use strict";var r=t("fbaa"),u=t.n(r);u.a},"8a38":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var u=r(t("6e3d"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"92df":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{orderinfo:function(){n.reLaunch({url:"/pageC/orderForm/orderForm"})},toindex:function(){n.switchTab({url:"/pages/index/index"})}}};e.default=t}).call(this,t("543d")["default"])},fbaa:function(n,e,t){}},[["8a38","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/index.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"9c25":function(e,t,n){},"9f3f":function(e,t,n){"use strict";n.r(t);var a=n("f6eb"),r=n("e35d");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("a165");var o=n("828b"),u=Object(o["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);t["default"]=u.exports},a165:function(e,t,n){"use strict";var a=n("9c25"),r=n.n(a);r.a},a412:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a},ca23:function(e,t,n){"use strict";(function(e,t){var a=n("47a9");n("abeb");a(n("3240"));var r=a(n("9f3f"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},e35d:function(e,t,n){"use strict";n.r(t);var a=n("a412"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f6eb:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return r})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},r=[]}},[["ca23","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"0387":function(e,t,n){"use strict";var a=n("b61b"),r=n.n(a);r.a},"73d5":function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){return a}));var r=function(){var e=this,t=e.$createElement;e._self._c},c=[]},b00b:function(e,t,n){"use strict";n.r(t);var a=n("73d5"),r=n("e3c0");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("0387");var o,u=n("f0c5"),i=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],o);t["default"]=i.exports},b61b:function(e,t,n){},cde8:function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("f93b");a(n("66fd"));var r=a(n("b00b"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},e3c0:function(e,t,n){"use strict";n.r(t);var a=n("f05a"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f05a:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a}},[["cde8","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/Senderinfor.wxml

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>

unpackage/dist/build/mp-weixin/pageB/citychange.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/citychange"],{"00cf":function(t,e,n){"use strict";n.r(e);var i=n("d334"),a=n.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(c);e["default"]=a.a},b8fe:function(t,e,n){"use strict";(function(t,e){var i=n("47a9");n("abeb");i(n("3240"));var a=i(n("bd04"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(a.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},bd04:function(t,e,n){"use strict";n.r(e);var i=n("c405"),a=n("00cf");for(var c in a)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(c);var u=n("828b"),r=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,null,null,!1,i["a"],void 0);e["default"]=r.exports},c405:function(t,e,n){"use strict";n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return i}));var i={liuIndexedList:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list")]).then(n.bind(null,"a5e0"))}},a=function(){var t=this.$createElement;this._self._c},c=[]},d334:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{dataList:[],searchlist:[]}},onShow:function(){this.getCountryList(),t.getStorageSync("searchlist")&&(this.searchlist=t.getStorageSync("searchlist"))},methods:{getCountryList:function(){var e=this;t.$u.http.get("/api/area?is_domestic=0&pid=").then((function(t){e.dataList=t}))},click:function(e){var n=this.getOpenerEventChannel();n.emit("getadd",e),this.searchlist.includes(e)||(this.searchlist.unshift(e),t.setStorageSync("searchlist",this.searchlist.slice(0,6))),t.navigateBack()}}};e.default=n}).call(this,n("df3c")["default"])}},[["b8fe","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/citychange"],{"1d67":function(t,e,n){"use strict";n.r(e);var i=n("c458"),a=n("2789");for(var c in a)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(c);var u,r=n("f0c5"),s=Object(r["a"])(a["default"],i["b"],i["c"],!1,null,null,null,!1,i["a"],u);e["default"]=s.exports},2789:function(t,e,n){"use strict";n.r(e);var i=n("ae74"),a=n.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(c);e["default"]=a.a},ae74:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{dataList:[],searchlist:[]}},onShow:function(){this.getCountryList(),t.getStorageSync("searchlist")&&(this.searchlist=t.getStorageSync("searchlist"))},methods:{getCountryList:function(){var e=this;t.$u.http.get("/api/area?is_domestic=0&pid=").then((function(t){e.dataList=t}))},click:function(e){var n=this.getOpenerEventChannel();n.emit("getadd",e),this.searchlist.includes(e)||(this.searchlist.unshift(e),t.setStorageSync("searchlist",this.searchlist.slice(0,6))),t.navigateBack()}}};e.default=n}).call(this,n("543d")["default"])},c333:function(t,e,n){"use strict";(function(t,e){var i=n("4ea4");n("f93b");i(n("66fd"));var a=i(n("1d67"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(a.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},c458:function(t,e,n){"use strict";n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return i}));var i={liuIndexedList:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list")]).then(n.bind(null,"d4db"))}},a=function(){var t=this,e=t.$createElement;t._self._c},c=[]}},[["c333","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/index.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{1260:function(n,t,e){"use strict";e.r(t);var u=e("23f4"),a=e("8646");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);var c=e("828b"),f=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);t["default"]=f.exports},"23f4":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},3201:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{}}}},5459:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var a=u(e("1260"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},8646:function(n,t,e){"use strict";e.r(t);var u=e("3201"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a}},[["5459","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{"37ba":function(e,n,t){"use strict";t.r(n);var u=t("c91e"),r=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=r.a},"6f72":function(e,n,t){"use strict";t.r(n);var u=t("72bd"),r=t("37ba");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);var c,f=t("f0c5"),i=Object(f["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},"72bd":function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var r=function(){var e=this,n=e.$createElement;e._self._c},a=[]},"748e":function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var r=u(t("6f72"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},c91e:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u}},[["748e","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/orderinfo.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{19627:function(n,e,t){"use strict";var r=t("2d95"),o=t.n(r);o.a},"25fa":function(n,e,t){"use strict";t.r(e);var r=t("d198"),o=t("a9d5");for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);t("19627");var u=t("828b"),a=Object(u["a"])(o["default"],r["b"],r["c"],!1,null,"185ecc00",null,!1,r["a"],void 0);e["default"]=a.exports},"2d95":function(n,e,t){},"8b5a":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.myPackage+"-"+this.i18n.Vieworder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/express/express"})}}};e.default=t}).call(this,t("df3c")["default"])},"8d8c":function(n,e,t){"use strict";(function(n,e){var r=t("47a9");t("abeb");r(t("3240"));var o=r(t("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},a9d5:function(n,e,t){"use strict";t.r(e);var r=t("8b5a"),o=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);e["default"]=o.a},d198:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"f3ae"))}},o=function(){var n=this.$createElement;this._self._c},i=[]}},[["8d8c","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"29cc":function(n,e,t){"use strict";var r=t("9b36"),o=t.n(r);o.a},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},8079:function(n,e,t){"use strict";t.r(e);var r=t("86be"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("29cc");var i,c=t("f0c5"),a=Object(c["a"])(o["default"],r["b"],r["c"],!1,null,"185ecc00",null,!1,r["a"],i);e["default"]=a.exports},"86be":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"9b36":function(n,e,t){},"9e74":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.myPackage+"-"+this.i18n.Vieworder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/express/express"})}}};e.default=t}).call(this,t("543d")["default"])},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/parcel.wxml

@@ -1 +1 @@
-<view class="back data-v-42e1a5af"><view class="box data-v-42e1a5af" style="border-radius:16rpx 16rpx 0 0;"><view class="boxitem u-flex data-v-42e1a5af"><text class="name data-v-42e1a5af">{{i18n.TrackingNumber}}</text><input style="flex:1;" type="text" placeholder="{{i18n.trackingNumber}}" data-event-opts="{{[['input',[['__set_model',['','logistics_no','$event',[]]]]]]}}" value="{{logistics_no}}" bindinput="__e" class="data-v-42e1a5af"/></view></view><view class="box data-v-42e1a5af"><view class="boxitem u-flex u-row-between data-v-42e1a5af"><text class="name data-v-42e1a5af">{{i18n.Expresscompany}}</text><view data-event-opts="{{[['tap',[['toexpress',['$event']]]]]}}" class="u-flex data-v-42e1a5af" bindtap="__e"><view class="selection data-v-42e1a5af">{{logistics_company_name||i18n.selection}}</view><image style="width:30rpx;height:30rpx;" src="../static/express/next1.png" mode class="data-v-42e1a5af"></image></view></view></view><view class="box data-v-42e1a5af" style="border-radius:0 0 16rpx 16rpx;"><view class="boxitem u-flex u-row-end data-v-42e1a5af"><text class="name data-v-42e1a5af">{{i18n.Parcelweight}}</text><input style="flex:1;" type="text" placeholder="{{i18n.parcelWeight}}" data-event-opts="{{[['input',[['__set_model',['','estimated_weight','$event',[]]]]]]}}" value="{{estimated_weight}}" bindinput="__e" class="data-v-42e1a5af"/><text class="data-v-42e1a5af">kg</text></view></view><view data-event-opts="{{[['tap',[['offline',['$event']]]]]}}" class="btn data-v-42e1a5af" bindtap="__e">{{''+i18n.Addlist+''}}</view></view>
+<view class="back data-v-b3873b36"><view class="box data-v-b3873b36" style="border-radius:16rpx 16rpx 0 0;"><view class="boxitem u-flex data-v-b3873b36"><text class="name data-v-b3873b36">{{i18n.TrackingNumber}}</text><input style="flex:1;" type="text" placeholder="{{i18n.trackingNumber}}" data-event-opts="{{[['input',[['__set_model',['','logistics_no','$event',[]]]]]]}}" value="{{logistics_no}}" bindinput="__e" class="data-v-b3873b36"/></view></view><view class="box data-v-b3873b36"><view class="boxitem u-flex u-row-between data-v-b3873b36"><text class="name data-v-b3873b36">{{i18n.Expresscompany}}</text><view data-event-opts="{{[['tap',[['toexpress',['$event']]]]]}}" class="u-flex data-v-b3873b36" bindtap="__e"><view class="selection data-v-b3873b36">{{logistics_company_name||i18n.selection}}</view><image style="width:30rpx;height:30rpx;" src="../static/express/next1.png" mode class="data-v-b3873b36"></image></view></view></view><view class="box data-v-b3873b36" style="border-radius:0 0 16rpx 16rpx;"><view class="boxitem u-flex u-row-end data-v-b3873b36"><text class="name data-v-b3873b36">{{i18n.Parcelweight}}</text><input style="flex:1;" type="text" placeholder="{{i18n.parcelWeight}}" data-event-opts="{{[['input',[['__set_model',['','estimated_weight','$event',[]]]]]]}}" value="{{estimated_weight}}" bindinput="__e" class="data-v-b3873b36"/><text class="data-v-b3873b36">kg</text></view></view><view data-event-opts="{{[['tap',[['offline',['$event']]]]]}}" class="btn data-v-b3873b36" bindtap="__e">{{''+i18n.Addlist+''}}</view></view>

unpackage/dist/build/mp-weixin/pageB/parcel.wxss

@@ -1 +1 @@
-.selection.data-v-42e1a5af{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#666;line-height:40rpx;text-align:left;font-style:normal}.btn.data-v-42e1a5af{width:686rpx;height:88rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal;margin-top:94rpx}.back.data-v-42e1a5af{box-sizing:border-box;padding:20rpx 24rpx}.box.data-v-42e1a5af{padding:0 28rpx;box-sizing:border-box;width:702rpx;background:#fff;box-sizing:border-box}.box .boxitem.data-v-42e1a5af{height:100rpx;width:646rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.box .name.data-v-42e1a5af{width:150rpx;display:block;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:30rpx;color:#222;line-height:42rpx;text-align:left;font-style:normal;margin-right:44rpx}
+.selection.data-v-b3873b36{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#666;line-height:40rpx;text-align:left;font-style:normal}.btn.data-v-b3873b36{width:686rpx;height:88rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal;margin-top:94rpx}.back.data-v-b3873b36{box-sizing:border-box;padding:20rpx 24rpx}.box.data-v-b3873b36{padding:0 28rpx;box-sizing:border-box;width:702rpx;background:#fff;box-sizing:border-box}.box .boxitem.data-v-b3873b36{height:100rpx;width:646rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.box .name.data-v-b3873b36{width:150rpx;display:block;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:30rpx;color:#222;line-height:42rpx;text-align:left;font-style:normal;margin-right:44rpx}

unpackage/dist/build/mp-weixin/pageB/search.wxml

@@ -1 +1 @@
-<view class="back data-v-1ef384d5"><view class="u-flex u-row-between data-v-1ef384d5"><view style="width:622rpx;" class="data-v-1ef384d5"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-1ef384d5" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-1ef384d5">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-1ef384d5">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-1ef384d5" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex data-v-1ef384d5" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-1ef384d5" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-1ef384d5"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-1ef384d5" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-1ef384d5">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-1ef384d5">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-1ef384d5">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-1ef384d5">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>
+<view class="back data-v-1ef384d5"><view class="u-flex u-row-between data-v-1ef384d5"><view style="width:622rpx;" class="data-v-1ef384d5"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-1ef384d5" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-1ef384d5">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-1ef384d5">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-1ef384d5" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex  data-v-1ef384d5" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-1ef384d5" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-1ef384d5"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-1ef384d5" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-1ef384d5">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-1ef384d5">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-1ef384d5">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-1ef384d5">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>

unpackage/dist/build/mp-weixin/pageC/accountCancellation/accountCancellation.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"1ad5":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var u={uModal:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-modal/u-modal")]).then(e.bind(null,"6c25"))}},o=function(){var n=this,t=n.$createElement;n._self._c;n._isMounted||(n.e0=function(t){n.show=!0},n.e1=function(t){n.show=!1})},a=[]},"4c53":function(n,t,e){},"4d1a":function(n,t,e){"use strict";e.r(t);var u=e("1ad5"),o=e("9d78");for(var a in o)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(a);e("5aad");var c=e("828b"),i=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"08d147db",null,!1,u["a"],void 0);t["default"]=i.exports},"5aad":function(n,t,e){"use strict";var u=e("4c53"),o=e.n(u);o.a},"9d78":function(n,t,e){"use strict";e.r(t);var u=e("ece0"),o=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=o.a},ebe6:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var o=u(e("4d1a"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(o.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},ece0:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{show:!1}},computed:{i18n:function(){return this.$t("index")}},methods:{logout:function(){this.show=!1}}}}},[["ebe6","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"2b77":function(n,t,e){"use strict";e.r(t);var o=e("8416"),u=e.n(o);for(var c in o)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(c);t["default"]=u.a},"77d6":function(n,t,e){},8416:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{show:!1}},onLoad:function(){n.setNavigationBarTitle({title:this.i18n.accountCancellation}),this.reminder()},computed:{i18n:function(){return this.$t("index")}},methods:{reminder:function(){n.$u.http.get("/api/agreement?code=cancellation_reminder").then((function(n){console.log(n)}))},logout:function(){var t=this;n.$u.http.get("/api/member/freeze").then((function(n){t.$u.toast("注销成功"),t.show=!1}))}}};t.default=e}).call(this,e("543d")["default"])},aa81:function(n,t,e){"use strict";(function(n,t){var o=e("4ea4");e("f93b");o(e("66fd"));var u=o(e("c805"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},bcd3:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return o}));var o={uModal:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-modal/u-modal")]).then(e.bind(null,"7b40"))}},u=function(){var n=this,t=n.$createElement;n._self._c;n._isMounted||(n.e0=function(t){n.show=!0},n.e1=function(t){n.show=!1})},c=[]},c726:function(n,t,e){"use strict";var o=e("77d6"),u=e.n(o);u.a},c805:function(n,t,e){"use strict";e.r(t);var o=e("bcd3"),u=e("2b77");for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("c726");var a,i=e("f0c5"),r=Object(i["a"])(u["default"],o["b"],o["c"],!1,null,"4eee8fb5",null,!1,o["a"],a);t["default"]=r.exports}},[["aa81","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/accountCancellation/accountCancellation.wxml

@@ -1 +1 @@
-<view class="page data-v-08d147db"><view style="margin-bottom:40rpx;" class="data-v-08d147db">在注销账户前，请您进行以下风险确认:</view><view class="data-v-08d147db">1.请您注意在【我-钱包]中确认您是否存在尚未使用或提现的余额、优惠券等权益，我们建议您在注销前妥当处理您的资产，例如提现至银行卡、使用相关权益等。</view><view class="data-v-08d147db">2.请您务必审慎阅读关于您权益的重要提示，确保在您注销账号时已处理完毕权益。</view><button data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="btn data-v-08d147db" bindtap="__e">注销账号</button><view class="cancellation data-v-08d147db">注销后账户不可恢复，请谨慎操作</view><u-modal vue-id="85df3be4-1" buttonReverse="{{true}}" showCancelButton="{{true}}" confirmText="{{i18n.enter}}" cancelText="{{i18n.Cancel}}" show="{{show}}" title="{{i18n.accountCancellation}}" content="{{i18n.closeaccount}}" confirmColor="#606266" cancelColor="#2979ff" data-event-opts="{{[['^cancel',[['e1']]],['^confirm',[['logout']]]]}}" bind:cancel="__e" bind:confirm="__e" class="data-v-08d147db" bind:__l="__l"></u-modal></view>
+<view class="page data-v-4eee8fb5"><view style="margin-bottom:40rpx;" class="data-v-4eee8fb5">在注销账户前，请您进行以下风险确认:</view><view class="data-v-4eee8fb5">1.请您注意在【我-钱包]中确认您是否存在尚未使用或提现的余额、优惠券等权益，我们建议您在注销前妥当处理您的资产，例如提现至银行卡、使用相关权益等。</view><view class="data-v-4eee8fb5">2.请您务必审慎阅读关于您权益的重要提示，确保在您注销账号时已处理完毕权益。</view><button data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="btn data-v-4eee8fb5" bindtap="__e">注销账号</button><view class="cancellation data-v-4eee8fb5">注销后账户不可恢复，请谨慎操作</view><u-modal vue-id="85df3be4-1" buttonReverse="{{true}}" showCancelButton="{{true}}" confirmText="{{i18n.enter}}" cancelText="{{i18n.Cancel}}" show="{{show}}" title="{{i18n.accountCancellation}}" content="{{i18n.closeaccount}}" confirmColor="#606266" cancelColor="#2979ff" data-event-opts="{{[['^cancel',[['e1']]],['^confirm',[['logout']]]]}}" bind:cancel="__e" bind:confirm="__e" class="data-v-4eee8fb5" bind:__l="__l"></u-modal></view>

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

@@ -1 +1 @@
-.page.data-v-08d147db{background-color:#fff;height:92.5vh;padding:54rpx 44rpx;font-size:30rpx;color:rgba(34,34,34,.7)}.page .btn.data-v-08d147db{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:108rpx}.page .cancellation.data-v-08d147db{font-size:24rpx;text-align:center;margin-top:32rpx}
+.page.data-v-4eee8fb5{background-color:#fff;height:92.5vh;padding:54rpx 44rpx;font-size:30rpx;color:rgba(34,34,34,.7)}.page .btn.data-v-4eee8fb5{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:108rpx}.page .cancellation.data-v-4eee8fb5{font-size:24rpx;text-align:center;margin-top:32rpx}

unpackage/dist/build/mp-weixin/pageC/accountSecurity/accountSecurity.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/accountSecurity"],{"13eb":function(t,n,e){"use strict";e.r(n);var c=e("58a4"),u=e.n(c);for(var a in c)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(a);n["default"]=u.a},"41d8":function(t,n,e){"use strict";(function(t,n){var c=e("47a9");e("abeb");c(e("3240"));var u=c(e("cc4c"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},"58a4":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var c={data:function(){return{}},components:{textRight:function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("b162"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},methods:{toCancellation:function(){t.navigateTo({url:"/pageC/accountCancellation/accountCancellation"})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.account})}};n.default=c}).call(this,e("df3c")["default"])},"72d8":function(t,n,e){"use strict";var c=e("be99"),u=e.n(c);u.a},9821:function(t,n,e){"use strict";e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var c=function(){var t=this.$createElement;this._self._c},u=[]},be99:function(t,n,e){},cc4c:function(t,n,e){"use strict";e.r(n);var c=e("9821"),u=e("13eb");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("72d8");var i=e("828b"),o=Object(i["a"])(u["default"],c["b"],c["c"],!1,null,"5c759582",null,!1,c["a"],void 0);n["default"]=o.exports}},[["41d8","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/accountSecurity"],{"034c":function(t,n,c){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e=function(){c.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(c("ac58"))}.bind(null,c)).catch(c.oe)},a={data:function(){return{}},components:{textRight:e},computed:{i18n:function(){return this.$t("index")}},methods:{toCancellation:function(){t.navigateTo({url:"/pageC/accountCancellation/accountCancellation"})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.account})}};n.default=a}).call(this,c("543d")["default"])},"8b1a":function(t,n,c){"use strict";(function(t,n){var e=c("4ea4");c("f93b");e(c("66fd"));var a=e(c("92a1"));t.__webpack_require_UNI_MP_PLUGIN__=c,n(a.default)}).call(this,c("bc2e")["default"],c("543d")["createPage"])},"8c01":function(t,n,c){"use strict";var e=c("d7c0"),a=c.n(e);a.a},"92a1":function(t,n,c){"use strict";c.r(n);var e=c("b9cf"),a=c("b252");for(var u in a)["default"].indexOf(u)<0&&function(t){c.d(n,t,(function(){return a[t]}))}(u);c("8c01");var i,o=c("f0c5"),r=Object(o["a"])(a["default"],e["b"],e["c"],!1,null,"5c759582",null,!1,e["a"],i);n["default"]=r.exports},b252:function(t,n,c){"use strict";c.r(n);var e=c("034c"),a=c.n(e);for(var u in e)["default"].indexOf(u)<0&&function(t){c.d(n,t,(function(){return e[t]}))}(u);n["default"]=a.a},b9cf:function(t,n,c){"use strict";var e;c.d(n,"b",(function(){return a})),c.d(n,"c",(function(){return u})),c.d(n,"a",(function(){return e}));var a=function(){var t=this,n=t.$createElement;t._self._c},u=[]},d7c0:function(t,n,c){}},[["8b1a","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/accountSecurity/component/textRight.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{"068f":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}},props:{texts:{typeof:String,default:""}}};n.default=u},"0bff":function(t,n,e){"use strict";var u=e("5373"),f=e.n(u);f.a},"1be4":function(t,n,e){"use strict";e.r(n);var u=e("068f"),f=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);n["default"]=f.a},5373:function(t,n,e){},9565:function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return f})),e.d(n,"a",(function(){}));var u=function(){var t=this.$createElement;this._self._c},f=[]},b162:function(t,n,e){"use strict";e.r(n);var u=e("9565"),f=e("1be4");for(var r in f)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return f[t]}))}(r);e("0bff");var a=e("828b"),c=Object(a["a"])(f["default"],u["b"],u["c"],!1,null,"098f0a2c",null,!1,u["a"],void 0);n["default"]=c.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{"1fb2":function(t,n,e){"use strict";e.r(n);var u=e("9577"),c=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);n["default"]=c.a},"44b1":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return u}));var c=function(){var t=this,n=t.$createElement;t._self._c},r=[]},"773c":function(t,n,e){"use strict";var u=e("c0a5"),c=e.n(u);c.a},9577:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}},props:{texts:{typeof:String,default:""}}};n.default=u},ac58:function(t,n,e){"use strict";e.r(n);var u=e("44b1"),c=e("1fb2");for(var r in c)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(r);e("773c");var a,f=e("f0c5"),i=Object(f["a"])(c["default"],u["b"],u["c"],!1,null,"098f0a2c",null,!1,u["a"],a);n["default"]=i.exports},c0a5:function(t,n,e){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/accountSecurity/component/textRight-create-component',
     {
         'pageC/accountSecurity/component/textRight-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("b162"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("ac58"))
         })
     },
     [['pageC/accountSecurity/component/textRight-create-component']]

unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"4c51":function(t,n,e){"use strict";e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){}));var c=function(){var t=this.$createElement;this._self._c},i=[]},"56cc":function(t,n,e){"use strict";var c=e("d0c4"),i=e.n(c);i.a},"8edf":function(t,n,e){"use strict";e.r(n);var c=e("4c51"),i=e("9825");for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);e("56cc");var u=e("828b"),a=Object(u["a"])(i["default"],c["b"],c["c"],!1,null,"71c8c3a6",null,!1,c["a"],void 0);n["default"]=a.exports},9443:function(t,n,e){"use strict";(function(t,n){var c=e("47a9");e("abeb");c(e("3240"));var i=c(e("8edf"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(i.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},9825:function(t,n,e){"use strict";e.r(n);var c=e("d786"),i=e.n(c);for(var o in c)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(o);n["default"]=i.a},d0c4:function(t,n,e){},d786:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var c=e("bab7"),i={components:{AllRight:function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("2c60"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"}),c.conn.close()},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=i}).call(this,e("df3c")["default"])}},[["9443","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"58a5":function(t,n,e){"use strict";e.r(n);var u=e("e7dd"),a=e.n(u);for(var o in u)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(o);n["default"]=a.a},"67dc":function(t,n,e){"use strict";e.r(n);var u=e("8118"),a=e("58a5");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("fd8c");var i,c=e("f0c5"),r=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"71c8c3a6",null,!1,u["a"],i);n["default"]=r.exports},8118:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return u}));var a=function(){var t=this,n=t.$createElement;t._self._c},o=[]},8135:function(t,n,e){},"9e36":function(t,n,e){"use strict";(function(t,n){var u=e("4ea4");e("f93b");u(e("66fd"));var a=u(e("67dc"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},e7dd:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=e("970c"),a=function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("edae"))}.bind(null,e)).catch(e.oe)},o={components:{AllRight:a},computed:{i18n:function(){return this.$t("index")}},onShow:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"}),u.conn.close()},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=o}).call(this,e("543d")["default"])},fd8c:function(t,n,e){"use strict";var u=e("8135"),a=e.n(u);a.a}},[["9e36","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/addEditAddress/component/selectCity.wxss

@@ -1 +1 @@
-.title.data-v-55c0ff87{margin:32rpx 26rpx}.inp.data-v-55c0ff87{background-color:#f4f4f4;border-radius:36rpx;height:72rpx;width:694rpx;margin:30rpx auto 0;padding-left:20rpx}.city-list.data-v-55c0ff87{display:flex;justify-content:space-around;flex-wrap:wrap}.city-list .city.data-v-55c0ff87{width:156rpx;height:68rpx;text-align:center;line-height:68rpx;background-color:#f4f4f4;border-radius:36rpx;margin-bottom:20rpx;color:#222;font-size:28rpx}.confirm.data-v-55c0ff87{background-color:#f83224;border-radius:40rpx;color:#fff;width:702rpx;margin:0 auto}.picker-view.data-v-55c0ff87{width:100%;height:180px;margin-top:10px}.item.data-v-55c0ff87{height:50px}.text.data-v-55c0ff87{line-height:50px;text-align:center}.picker-view-column.data-v-55c0ff87{text-align:center}
+.title.data-v-3945fa6e{margin:32rpx 26rpx}.inp.data-v-3945fa6e{background-color:#f4f4f4;border-radius:36rpx;height:72rpx;width:694rpx;margin:30rpx auto 0;padding-left:20rpx}.city-list.data-v-3945fa6e{display:flex;justify-content:space-around;flex-wrap:wrap}.city-list .city.data-v-3945fa6e{width:156rpx;height:68rpx;text-align:center;line-height:68rpx;background-color:#f4f4f4;border-radius:36rpx;margin-bottom:20rpx;color:#222;font-size:28rpx}.city-list .select-city.data-v-3945fa6e{color:#f83224;border:2rpx solid #f83224}.confirm.data-v-3945fa6e{background-color:#f83224;border-radius:40rpx;color:#fff;width:702rpx;margin:0 auto}.picker-view.data-v-3945fa6e{width:100%;height:180px;margin-top:10px}.item.data-v-3945fa6e{height:50px}.text.data-v-3945fa6e{line-height:50px;text-align:center}.picker-view-column.data-v-3945fa6e{text-align:center}

unpackage/dist/build/mp-weixin/pageC/addressManagement/component/address.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{"0e5d":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};t.default=u},4402:function(n,t,e){"use strict";var u=e("5af0"),a=e.n(u);a.a},"5af0":function(n,t,e){},6780:function(n,t,e){"use strict";e.r(t);var u=e("0e5d"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a},"884b":function(n,t,e){"use strict";e.r(t);var u=e("cf54"),a=e("6780");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);e("4402");var c=e("828b"),f=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"2d6103bc",null,!1,u["a"],void 0);t["default"]=f.exports},cf54:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{"0efd":function(e,n,t){"use strict";var u=t("2608"),r=t.n(u);r.a},"129f":function(e,n,t){"use strict";t.r(n);var u=t("ee05"),r=t("be73");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);t("0efd");var f,c=t("f0c5"),i=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"2d6103bc",null,!1,u["a"],f);n["default"]=i.exports},2608:function(e,n,t){},6240:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};n.default=u},be73:function(e,n,t){"use strict";t.r(n);var u=t("6240"),r=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=r.a},ee05:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var r=function(){var e=this,n=e.$createElement;e._self._c},a=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/addressManagement/component/address-create-component',
     {
         'pageC/addressManagement/component/address-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("884b"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("129f"))
         })
     },
     [['pageC/addressManagement/component/address-create-component']]

unpackage/dist/build/mp-weixin/pageC/applicationRefund/component/reasonPopup.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/applicationRefund/component/reasonPopup"],{8006:function(n,e,o){"use strict";o.r(e);var u=o("b63b"),t=o("f2b2");for(var i in t)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return t[n]}))}(i);o("a893");var a=o("828b"),r=Object(a["a"])(t["default"],u["b"],u["c"],!1,null,"2f747a63",null,!1,u["a"],void 0);e["default"]=r.exports},a893:function(n,e,o){"use strict";var u=o("d3ae"),t=o.n(u);t.a},b63b:function(n,e,o){"use strict";o.d(e,"b",(function(){return t})),o.d(e,"c",(function(){return i})),o.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-popup/u-popup")]).then(o.bind(null,"f1b1"))},uRadioGroup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio-group/u-radio-group")]).then(o.bind(null,"02ee"))},uRadio:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio/u-radio")]).then(o.bind(null,"634f"))}},t=function(){var n=this.$createElement;this._self._c},i=[]},d3ae:function(n,e,o){},f2b2:function(n,e,o){"use strict";o.r(e);var u=o("f2ba"),t=o.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return u[n]}))}(i);e["default"]=t.a},f2ba:function(n,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(n){console.log(this.value),this.$emit("close",n)}}};e.default=u}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/applicationRefund/component/reasonPopup"],{"07f8":function(n,e,o){"use strict";o.r(e);var u=o("b4df"),t=o("4e66");for(var i in t)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return t[n]}))}(i);o("e2ae");var r,a=o("f0c5"),c=Object(a["a"])(t["default"],u["b"],u["c"],!1,null,"2f747a63",null,!1,u["a"],r);e["default"]=c.exports},"1c8c":function(n,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(n){console.log(this.value),this.$emit("close",n)}}};e.default=u},"4e66":function(n,e,o){"use strict";o.r(e);var u=o("1c8c"),t=o.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return u[n]}))}(i);e["default"]=t.a},"78c8":function(n,e,o){},b4df:function(n,e,o){"use strict";o.d(e,"b",(function(){return t})),o.d(e,"c",(function(){return i})),o.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-popup/u-popup")]).then(o.bind(null,"2f21"))},uRadioGroup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio-group/u-radio-group")]).then(o.bind(null,"fdad"))},uRadio:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio/u-radio")]).then(o.bind(null,"d94c"))}},t=function(){var n=this,e=n.$createElement;n._self._c},i=[]},e2ae:function(n,e,o){"use strict";var u=o("78c8"),t=o.n(u);t.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/applicationRefund/component/reasonPopup-create-component',
     {
         'pageC/applicationRefund/component/reasonPopup-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("8006"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("07f8"))
         })
     },
     [['pageC/applicationRefund/component/reasonPopup-create-component']]

unpackage/dist/build/mp-weixin/pageC/editName/editName.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/editName/editName"],{"29a9":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{name:"张三"}},onLoad:function(n){this.name=n.name},computed:{i18n:function(){return this.$t("index")}},mounted:function(){n.setNavigationBarTitle({title:this.i18n.editNextname})},methods:{changename:function(){var t=this.getOpenerEventChannel();t.emit("getname",this.name),n.navigateBack()}}};t.default=e}).call(this,e("df3c")["default"])},3802:function(n,t,e){"use strict";e.r(t);var a=e("709d"),i=e("cfa0");for(var u in i)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(u);e("78b5");var c=e("828b"),o=Object(c["a"])(i["default"],a["b"],a["c"],!1,null,"6c486249",null,!1,a["a"],void 0);t["default"]=o.exports},"39bf":function(n,t,e){"use strict";(function(n,t){var a=e("47a9");e("abeb");a(e("3240"));var i=a(e("3802"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(i.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},"709d":function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){return a}));var a={"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"7780"))}},i=function(){var n=this.$createElement,t=(this._self._c,this.name.length);this.$mp.data=Object.assign({},{$root:{g0:t}})},u=[]},"78b5":function(n,t,e){"use strict";var a=e("7bbf"),i=e.n(a);i.a},"7bbf":function(n,t,e){},cfa0:function(n,t,e){"use strict";e.r(t);var a=e("29a9"),i=e.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);t["default"]=i.a}},[["39bf","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/editName/editName"],{"49f1":function(n,t,e){},6166:function(n,t,e){"use strict";var a=e("49f1"),u=e.n(a);u.a},"733d":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{name:"张三"}},onLoad:function(n){this.name=n.name},computed:{i18n:function(){return this.$t("index")}},mounted:function(){n.setNavigationBarTitle({title:this.i18n.editNextname})},methods:{changename:function(){var t=this.getOpenerEventChannel();t.emit("getname",this.name),n.navigateBack()}}};t.default=e}).call(this,e("543d")["default"])},"79d4":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return a}));var a={"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"bead"))}},u=function(){var n=this,t=n.$createElement,e=(n._self._c,n.name.length);n.$mp.data=Object.assign({},{$root:{g0:e}})},i=[]},"9b00":function(n,t,e){"use strict";(function(n,t){var a=e("4ea4");e("f93b");a(e("66fd"));var u=a(e("b3bd"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},b3bd:function(n,t,e){"use strict";e.r(t);var a=e("79d4"),u=e("f7eb");for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);e("6166");var c,o=e("f0c5"),r=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,"6c486249",null,!1,a["a"],c);t["default"]=r.exports},f7eb:function(n,t,e){"use strict";e.r(t);var a=e("733d"),u=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(i);t["default"]=u.a}},[["9b00","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/ensureExplain/ensureExplain.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/ensureExplain/ensureExplain"],{"0b8d":function(e,n,t){},"22a6":function(e,n,t){"use strict";t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"aca6"))}},a=function(){var e=this.$createElement;this._self._c},r=[]},"8eeb":function(e,n,t){"use strict";t.r(n);var u=t("fa53"),a=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(r);n["default"]=a.a},"93f1":function(e,n,t){"use strict";var u=t("0b8d"),a=t.n(u);a.a},"9ab3":function(e,n,t){"use strict";t.r(n);var u=t("22a6"),a=t("8eeb");for(var r in a)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(r);t("93f1");var o=t("828b"),c=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=c.exports},d58c:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("9ab3"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},fa53:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{agreementContent:""}},methods:{getAgreementContent:function(){var n=this;e.$u.http.get("/api/agreement?code=margin_rule").then((function(e){console.log(e),n.agreementContent=e}))}},mounted:function(){this.getAgreementContent()}};n.default=t}).call(this,t("df3c")["default"])}},[["d58c","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/ensureExplain/ensureExplain"],{"14a5":function(e,n,t){"use strict";var u=t("d339"),r=t.n(u);r.a},7538:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{agreementContent:""}},methods:{getAgreementContent:function(){var n=this;e.$u.http.get("/api/agreement?code=margin_rule").then((function(e){console.log(e),n.agreementContent=e}))}},mounted:function(){this.getAgreementContent()}};n.default=t}).call(this,t("543d")["default"])},b458:function(e,n,t){"use strict";t.r(n);var u=t("f4e5"),r=t("bc26");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);t("14a5");var o,c=t("f0c5"),i=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],o);n["default"]=i.exports},bc26:function(e,n,t){"use strict";t.r(n);var u=t("7538"),r=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=r.a},d339:function(e,n,t){},f263:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var r=u(t("b458"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},f4e5:function(e,n,t){"use strict";t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"0d5f"))}},r=function(){var e=this,n=e.$createElement;e._self._c},a=[]}},[["f263","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/index.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{"48bd":function(e,n,t){"use strict";t.r(n);var u=t("eae9"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=a.a},"86af":function(e,n,t){"use strict";t.r(n);var u=t("c17c"),a=t("48bd");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);var r=t("828b"),f=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=f.exports},c17c:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},a=[]},eae9:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}},created:function(){}}},f268:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("86af"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["f268","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{"05b2":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var c=function(){var n=this,t=n.$createElement;n._self._c},r=[]},6188:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{}},created:function(){}};t.default=u},abcd:function(n,t,e){"use strict";e.r(t);var u=e("05b2"),c=e("f9cd");for(var r in c)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(r);var a,f=e("f0c5"),i=Object(f["a"])(c["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],a);t["default"]=i.exports},cbb2:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var c=u(e("abcd"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(c.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},f9cd:function(n,t,e){"use strict";e.r(t);var u=e("6188"),c=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=c.a}},[["cbb2","common/runtime","common/vendor"]]]);