冲突

commont/messages.js

@@ -310,7 +310,8 @@ export default {
 			grouping: '立即拼团',
 			Selected: '已选',
 			Buynow: '立即购买',
-			closeaccount:'确定要注销账号吗?'
+			closeaccount:'确定要注销账号吗?',
+			other:'其他'
 		},
 	},
 	//英语
@@ -617,7 +618,8 @@ export default {
 			grouping: 'Join Group Now',
 			Selected: 'Selected',
 			Buynow: 'Buy Now',
-			closeaccount:'Are you sure you want to close your account?'
+			closeaccount:'Are you sure you want to close your account?',
+			other:'other'
 		},
 	},
 	// 西班牙
@@ -906,7 +908,8 @@ export default {
 			Please: 'Por favor, introduzca el nombre del artículo',
 			Filling: 'Rellene el artículo de envío con precisión para que podamos recomendarle productos más adecuados',
 			Note: 'Nota: El peso y el volumen reales se determinan por el mensajero. El peso puede aumentar después del empaque, y si el artículo tiene un peso pequeño pero un volumen grande, se cobrará según el peso volumétrico',
-			closeaccount:'Seguro que desea cerrar su cuenta?'
+			closeaccount:'Seguro que desea cerrar su cuenta?',
+			other:'otros'
 		},
 	},
 	//意大利
@@ -980,7 +983,7 @@ export default {
 			productManagement: "Gestione dei prodotti di base",
 			orderManagement: "Gestione delle ordinazioni",
 			afterSales: "Gestione post-vendita",
-			supplyChain: "Prodotti della catena d’approvvigionamento",
+			supplyChain: "Prodotti della catena d’approvv igionamento",
 			PCEnd: "PC, copiglie, pernotti",
 			pontact: "Contatti con il servizio clienti",
 			accountSettings: "Fissazione del numero di conto",
@@ -1210,7 +1213,8 @@ export default {
 			grouping: 'Unisciti al gruppo immediatamente',
 			Selected: 'Selezionato',
 			Buynow: 'Acquista ora',
-			closeaccount:'E’ sicuro di voler cancellare il numero di conto?'
+			closeaccount:'E’ sicuro di voler cancellare il numero di conto?',
+			other:'altri'
 		},
 	},
 };

pageA/comment.vue

@@ -21,7 +21,8 @@
 				<view 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">
+				<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>

pageA/payorder.vue

@@ -1,680 +1,584 @@
 <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">￥</text>
-          <text v-if="state_id == 1">$</text>
-          <text v-if="state_id == 2">€</text>
-          <text v-if="state_id == 3">￥</text>
-          <text style="font-size: 60rpx; font-weight: 600">{{ sum }}</text>
-        </view>
-        <!-- 				<view class="">
+        ">
+				<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>{{ sum1 }}</text>
+				</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="">保证金支付</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="">保证金支付</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
-              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>
-          <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 }}：{{ 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="
                 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">{{
         i18n.Paymentinstructions
       }}</view>
-      <view class="content" style="margin-top: 18rpx"
-        >1.联系客服付款需走线下支付通道，付款成</view
-      >
-    </view>
-    <view class="confirm" @click="confirm">
-      {{ i18n.Confirmpayment }}
-    </view>
-  </view>
+			<view class="content" style="margin-top: 18rpx">1.联系客服付款需走线下支付通道，付款成</view>
+		</view>
+		<view class="confirm" @click="confirm">
+			{{ i18n.Confirmpayment }}
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      mode: 0,
-      stateshow: false,
-      state: "人民币",
-      state_id: 0,
-      array: [],
-      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: "",
+			};
+		},
+		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);
 
-                // },
-                // 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.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>

pageC/addEditAddress/addEditAddress.vue

@@ -1,9 +1,9 @@
 <template>
-  <view class="page">
-    <view class="content">
-      <view class="title">
-        <text class="title-left">{{ i18n.contacts }}</text>
-        <!-- <view class="title-right">
+	<view class="page">
+		<view class="content">
+			<view class="title">
+				<text class="title-left">{{ i18n.contacts }}</text>
+				<!-- <view class="title-right">
           <image
             src="../../static/mine/331.png"
             class="title-icon"
@@ -11,327 +11,373 @@
           ></image>
           <text>{{ i18n.wxAddress }}</text>
         </view> -->
-      </view>
-      <!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-      <u--form labelPosition="left" :model="model1" ref="uForm">
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.name"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.name"
-            :placeholder="i18n.goods"
-            border="none"
-          ></u--input>
-        </u-form-item>
+			</view>
+			<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
+			<u--form labelPosition="left" :model="model1" ref="uForm">
+				<u-form-item labelWidth="150rpx" :label="i18n.name" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.name" :placeholder="i18n.goods" border="none"></u--input>
+				</u-form-item>
 
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.phone"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.phone"
-            :placeholder="i18n.pleasePhoneNumber"
-            border="none"
-          ></u--input>
-        </u-form-item>
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.city"
-          borderBottom
-          @click="show = true"
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.city"
-            disabled
-            disabledColor="#ffffff"
-            :placeholder="i18n.township"
-            border="none"
-          ></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-        </u-form-item>
+				<u-form-item labelWidth="150rpx" :label="i18n.phone" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.phone" :placeholder="i18n.pleasePhoneNumber"
+						border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="150rpx" :label="i18n.city" borderBottom @click="show = true" ref="item1">
+					<u--input v-model="model1.userInfo.city" disabled disabledColor="#ffffff"
+						:placeholder="i18n.township" border="none"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
 
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.detailed"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.detailed"
-            :placeholder="i18n.sect"
-            border="none"
-          ></u--input>
-        </u-form-item>
-        <view class="company">
-          <u--input
-            v-model="model1.userInfo.company"
-            :placeholder="i18n.company"
-            border="none"
-          ></u--input>
-        </view>
-        <view
-          style="
+				<u-form-item labelWidth="150rpx" :label="i18n.detailed" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.detailed" :placeholder="i18n.sect" border="none"></u--input>
+				</u-form-item>
+				<view class="company">
+					<u--input v-model="model1.userInfo.company" :placeholder="i18n.company" border="none"></u--input>
+				</view>
+				<view style="
             display: flex;
             justify-content: space-between;
             align-items: center;
-          "
-        >
-          <view
-            class="item-left"
-            @click="model1.userInfo.is_default = !model1.userInfo.is_default"
-          >
-            <image
-              src="../../static/mine/327.png"
-              class="address-icon"
-              mode=""
-              v-if="!model1.userInfo.is_default"
-            ></image>
+          ">
+					<view class="item-left" @click="model1.userInfo.is_default = !model1.userInfo.is_default">
+						<image src="../../static/mine/327.png" class="address-icon" mode=""
+							v-if="!model1.userInfo.is_default"></image>
 
-            <image
-              v-else
-              src="../../static/mine/330.png"
-              class="address-icon"
-              mode=""
-            ></image>
-            <text>{{ i18n.initial }}</text>
-          </view>
-          <text style="font-size: 24rpx; color: #333" @click="empty">{{
+						<image v-else src="../../static/mine/330.png" class="address-icon" mode=""></image>
+						<text>{{ i18n.initial }}</text>
+					</view>
+					<text style="font-size: 24rpx; color: #333" @click="empty">{{
             i18n.empty
           }}</text>
-        </view>
-      </u--form>
-    </view>
-    <SelectCity :show="show" @close="close" :cityId="cityId" />
-    <view class="footer">
-      <button class="save" @click="submit">{{ i18n.preserve }}</button>
-    </view>
-  </view>
+				</view>
+			</u--form>
+		</view>
+		<SelectCity :show="show" @close="close" :cityId="cityId" />
+		<view class="" v-if="addlist.length>0 && ifadd==0">
+			<view class="history">{{i18n.history}}</view>
+			<view class="add" @click="topadd(item)" v-for="(item,idx) in addlist" :key="idx">
+				<view class="">
+					<text class="name">{{item.name}}</text>
+					<text class="phone">{{item.mobile.slice(0,3)}}****{{item.mobile.slice(-4)}}</text>
+				</view>
+				<view class="addinfo">{{item.province_name + item.city_name + item.area_name + item.address}}</view>
+			</view>
+		</view>
+		<view class="footer">
+			<button class="save" @click="submit">{{ i18n.preserve }}</button>
+		</view>
+	</view>
 </template>
 
 <script>
-import SelectCity from "./component/selectCity.vue";
-export default {
-  components: {
-    SelectCity,
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  data() {
-    return {
-      show: false,
-      cityId: [],
-      cityPid: {},
-      addressId: "",
-      model1: {
-        userInfo: {
-          name: "",
-          sex: "",
-          phone: "",
-          city: "",
-          detailed: "",
-          company: "",
-          is_default: 0,
-          country_id: 0,
-        },
-      },
-      rules: {
-        "userInfo.name": {
-          type: "string",
-          required: true,
-          message: "请填写姓名",
-          trigger: ["blur", "change"],
-        },
-        "userInfo.sex": {
-          type: "string",
-          max: 1,
-          required: true,
-          message: "请选择男或女",
-          trigger: ["blur", "change"],
-        },
-      },
-    };
-  },
-  onLoad(options) {
-    if (options.id) {
-      console.log(options.id);
-      this.addressId = options.id;
-      this.getAddressDetail(options.id);
-    }
-  },
-  methods: {
-    //编辑 or 新增
-    submit() {
-      const obj = {
-        mobile: this.model1.userInfo.phone,
-        name: this.model1.userInfo.name,
-        is_default: this.model1.userInfo.is_default ? 1 : 0,
-        company_name: this.model1.userInfo.company,
-        address: this.model1.userInfo.detailed,
-        country_id: this.model1.userInfo.country_id,
-      };
-      //有id为编辑，没有id为新增
-      if (this.addressId) {
-        uni.$u.http
-          .put(`/api/address/${this.addressId}`, { ...obj, ...this.cityPid })
-          .then((res) => {
-            console.log(res);
-            const eventchannel = this.getOpenerEventChannel();
-            eventchannel.emit("topadd", res);
-            uni.navigateBack({
-              delta: 1,
-            });
-          })
-          .catch(() => {});
-      } else {
-        uni.$u.http
-          .post(`/api/address`, { ...obj, ...this.cityPid })
-          .then((res) => {
-            // console.log(res);
-            const eventchannel = this.getOpenerEventChannel();
-            eventchannel.emit("topadd", res);
-            uni.navigateBack({
-              delta: 1,
-            });
-          })
-          .catch(() => {});
-      }
-    },
+	import SelectCity from "./component/selectCity.vue";
+	export default {
+		components: {
+			SelectCity,
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		data() {
+			return {
+				ifadd: 0,
+				show: false,
+				cityId: [],
+				cityPid: {},
+				addressId: "",
+				model1: {
+					userInfo: {
+						name: "",
+						sex: "",
+						phone: "",
+						city: "",
+						detailed: "",
+						company: "",
+						is_default: 0,
+						country_id: 0,
+					},
+				},
+				rules: {
+					"userInfo.name": {
+						type: "string",
+						required: true,
+						message: "请填写姓名",
+						trigger: ["blur", "change"],
+					},
+					"userInfo.sex": {
+						type: "string",
+						max: 1,
+						required: true,
+						message: "请选择男或女",
+						trigger: ["blur", "change"],
+					},
+				},
+				addlist: []
+			};
+		},
+		onLoad(options) {
+			if (options.ifadd) {
+				this.ifadd = options.ifadd
+			} else {
+				this.ifadd = 0
+			}
+			if (options.id) {
+				console.log(options.id);
+				this.addressId = options.id;
+				this.getAddressDetail(options.id);
+			}
+		},
+		onShow() {
+			this.getaddlist()
+		},
+		methods: {
+			topadd(item) {
+				const eventchannel = this.getOpenerEventChannel();
+				eventchannel.emit("topadd", item);
+				uni.navigateBack({
+					delta: 1,
+				});
+			},
+			//地址列表
+			getaddlist(id) {
+				uni.$u.http.get('/api/address', {
+					params: {
+						is_page: 0,
+						is_domestic: 1
+					}
+				}).then((res) => {
+					console.log(res);
+					this.addlist = res
+				}).catch(() => {
 
-    //清空输入
-    empty() {
-      this.model1.userInfo = {
-        name: "",
-        sex: "",
-        phone: "",
-        city: "",
-        detailed: "",
-        company: "",
-        is_default: 0,
-        country_id: 0,
-      };
-    },
-    //关闭选择城市弹窗
-    close(obj) {
-      this.show = false;
-      if (obj && obj.name) {
-        this.model1.userInfo.city =
-          obj.name + obj.children.name + obj.children.children.name;
-        this.cityId = [obj.id, obj.children.id, obj.children.children.id];
-        this.cityPid.province_id = obj.id;
-        this.cityPid.city_id = obj.children.id;
-        this.cityPid.area_id = obj.children.children.id;
-      }
-    },
-    //回显数据
-    getAddressDetail(id) {
-      uni.$u.http.get(`/api/address/${id}`).then((res) => {
-        this.model1.userInfo.city =
-          res.province_name + res.city_name + res.area_name;
-        this.model1.userInfo.name = res.name;
-        this.model1.userInfo.phone = res.mobile;
-        this.model1.userInfo.detailed = res.address;
-        this.model1.userInfo.company = res.company_name;
-        this.model1.userInfo.is_default = res.is_default;
-        this.model1.userInfo.country_id = res.country_id;
-        if (res.province_id && res.city_id && res.area_id) {
-          this.cityId = [res.province_id, res.city_id, res.area_id];
-        }
-      });
-    },
-  },
-  mounted() {
-    uni.setNavigationBarTitle({
-      title: this.i18n.newAddress,
-    });
-  },
-  onReady() {
-    //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-    this.$refs.uForm.setRules(this.rules);
-  },
-};
+				})
+			},
+			//编辑 or 新增
+			submit() {
+				const obj = {
+					mobile: this.model1.userInfo.phone,
+					name: this.model1.userInfo.name,
+					is_default: this.model1.userInfo.is_default ? 1 : 0,
+					company_name: this.model1.userInfo.company,
+					address: this.model1.userInfo.detailed,
+					country_id: this.model1.userInfo.country_id,
+				};
+				//有id为编辑，没有id为新增
+				if (this.addressId) {
+					uni.$u.http
+						.put(`/api/address/${this.addressId}`, {
+							...obj,
+							...this.cityPid
+						})
+						.then((res) => {
+							console.log(res);
+							const eventchannel = this.getOpenerEventChannel();
+							eventchannel.emit("topadd", res);
+							uni.navigateBack({
+								delta: 1,
+							});
+						})
+						.catch(() => {});
+				} else {
+					uni.$u.http
+						.post(`/api/address`, {
+							...obj,
+							...this.cityPid
+						})
+						.then((res) => {
+							// console.log(res);
+							const eventchannel = this.getOpenerEventChannel();
+							eventchannel.emit("topadd", res);
+							uni.navigateBack({
+								delta: 1,
+							});
+						})
+						.catch(() => {});
+				}
+			},
+
+			//清空输入
+			empty() {
+				this.model1.userInfo = {
+					name: "",
+					sex: "",
+					phone: "",
+					city: "",
+					detailed: "",
+					company: "",
+					is_default: 0,
+					country_id: 0,
+				};
+			},
+			//关闭选择城市弹窗
+			close(obj) {
+				this.show = false;
+				if (obj && obj.name) {
+					this.model1.userInfo.city =
+						obj.name + obj.children.name + obj.children.children.name;
+					this.cityId = [obj.id, obj.children.id, obj.children.children.id];
+					this.cityPid.province_id = obj.id;
+					this.cityPid.city_id = obj.children.id;
+					this.cityPid.area_id = obj.children.children.id;
+				}
+			},
+			//回显数据
+			getAddressDetail(id) {
+				uni.$u.http.get(`/api/address/${id}`).then((res) => {
+					this.model1.userInfo.city =
+						res.province_name + res.city_name + res.area_name;
+					this.model1.userInfo.name = res.name;
+					this.model1.userInfo.phone = res.mobile;
+					this.model1.userInfo.detailed = res.address;
+					this.model1.userInfo.company = res.company_name;
+					this.model1.userInfo.is_default = res.is_default;
+					this.model1.userInfo.country_id = res.country_id;
+					if (res.province_id && res.city_id && res.area_id) {
+						this.cityId = [res.province_id, res.city_id, res.area_id];
+					}
+				});
+			},
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.newAddress,
+			});
+		},
+		onReady() {
+			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
+			this.$refs.uForm.setRules(this.rules);
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.page {
-  padding: 20rpx 24rpx;
+	.add {
+		width: 702rpx;
+		// height: 160rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
+		margin-bottom: 20rpx;
+
+		.addinfo {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #222222;
+			line-height: 34rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.name {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.phone {
+			font-family: SFPro, SFPro;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #333333;
+			line-height: 28rpx;
+			text-align: left;
+			font-style: normal;
+			margin-left: 16rpx;
+		}
+	}
+
+	.history {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #333333;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+		margin: 28rpx 0 24rpx;
+	}
+
+	.page {
+		padding: 20rpx 24rpx;
+
+		.content {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 24rpx;
+
+			.title {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 100rpx;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
 
-  .content {
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 0 24rpx;
+				.title-left {
+					font-size: 32rpx;
+					color: #333;
+					font-weight: 600;
+				}
 
-    .title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      height: 100rpx;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+				.title-icon {
+					width: 26rpx;
+					height: 26rpx;
+					margin-right: 10rpx;
+				}
 
-      .title-left {
-        font-size: 32rpx;
-        color: #333;
-        font-weight: 600;
-      }
+				.title-right {
+					display: flex;
+					align-items: center;
+					font-size: 24rpx;
+					color: rgba(51, 51, 51, 0.6);
+				}
+			}
 
-      .title-icon {
-        width: 26rpx;
-        height: 26rpx;
-        margin-right: 10rpx;
-      }
+			.company {
+				height: 102rpx;
+				display: flex;
+				align-items: center;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+			}
+		}
 
-      .title-right {
-        display: flex;
-        align-items: center;
-        font-size: 24rpx;
-        color: rgba(51, 51, 51, 0.6);
-      }
-    }
+		.item-left {
+			font-size: 24rpx;
+			color: #333;
+			display: flex;
+			align-items: center;
+			height: 86rpx;
 
-    .company {
-      height: 102rpx;
-      display: flex;
-      align-items: center;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-    }
-  }
+			.address-icon {
+				width: 26rpx;
+				height: 26rpx;
+				margin-right: 10rpx;
+			}
+		}
 
-  .item-left {
-    font-size: 24rpx;
-    color: #333;
-    display: flex;
-    align-items: center;
-    height: 86rpx;
+		.footer {
+			background-color: #fff;
+			position: fixed;
+			bottom: 0;
+			height: 146rpx;
+			width: 750rpx;
+			left: 0;
+			padding-top: 20rpx;
 
-    .address-icon {
-      width: 26rpx;
-      height: 26rpx;
-      margin-right: 10rpx;
-    }
-  }
-  .footer {
-    background-color: #fff;
-    position: fixed;
-    bottom: 0;
-    height: 146rpx;
-    width: 750rpx;
-    left: 0;
-    padding-top: 20rpx;
-    .save {
-      width: 702rpx;
-      margin: 0 auto;
-      background-color: #f83224;
-      color: #fff;
-      border-radius: 40rpx;
-    }
-  }
-}
-</style>
+			.save {
+				width: 702rpx;
+				margin: 0 auto;
+				background-color: #f83224;
+				color: #fff;
+				border-radius: 40rpx;
+			}
+		}
+	}
+</style>

pageC/addressManagement/addressManagement.vue

@@ -15,12 +15,12 @@
 		<view class="empty" v-else> 空空如也~ </view>
 		<view class="footer" v-if="manage == 1">
 			<!-- <button class="wx">{{ i18n.wx }}</button> -->
-			<button class="add-international" @click="toAddRess('/pageC/addEditAddress/addEditAddress')">
+			<button class="add-international" @click="toAddRess('/pageC/addEditAddress/addEditAddress?ifadd=1')">
 				{{ i18n.add }}
 			</button>
 		</view>
 		<view class="footer" v-else>
-			<button class="add-international" @click="toAddRess('/pageC/internationalAddress/internationalAddress')">
+			<button class="add-international" @click="toAddRess('/pageC/internationalAddress/internationalAddress?')">
 				{{ i18n.add }}
 			</button>
 		</view>

pageC/myPackage/myPackage.vue

@@ -2,7 +2,7 @@
   <view>
     <view class="top-search">
       <u--input
-        placeholder="请输入订单编号搜索"
+        :placeholder="i18n.orderNum"
         prefixIcon="search"
         shape="circle"
         v-model="orderId"
@@ -14,28 +14,28 @@
           class="tab"
           @click="tabSwitch('to_transit')"
         >
-          发往中转点{{ statusNum.to_transit }}
+          {{i18n.deliver}}{{ statusNum.to_transit }}
         </view>
         <view
           :class="{ commodity: follow == 'transit_receipt' }"
           class="tab"
           @click="tabSwitch('transit_receipt')"
         >
-          中转已签收 {{ statusNum.transit_receipt }}
+          {{i18n.Sign}} {{ statusNum.transit_receipt }}
         </view>
         <view
           :class="{ commodity: follow == 'to_overseas' }"
           class="tab"
           @click="tabSwitch('to_overseas')"
         >
-          正发往海外 {{ statusNum.to_overseas }}
+          {{i18n.overseas}} {{ statusNum.to_overseas }}
         </view>
         <view
           :class="{ commodity: follow == 'other' }"
           class="tab"
           @click="tabSwitch('other')"
         >
-          其他 {{ statusNum.other }}
+          {{i18n.other}} {{ statusNum.other }}
         </view>
       </view>
     </view>
@@ -47,7 +47,7 @@
           src="../../static/mine/336.png"
           mode=""
         ></image>
-        当前页面加载的订单总重量{{ weights }}kg
+        {{i18n.orderWeight}}{{ weights }}kg
       </view>
       <view v-for="item in orderList" :key="item.orderStatus">
         <PackageCard :itemInfo="item" @toInformation="toInformation" />

pages/mine/component/personalFunction.vue

@@ -1,111 +1,108 @@
 <template>
-  <!-- 个人功能 -->
-  <view class="team">
-    <text class="team-title">{{ i18n.thatPerson }}</text>
-    <view class="function-team">
-      <view class="icon-center" @click="toSetleIn">
-        <image
-          class="form-icon"
-          src="../../../static/mine/322.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.become }}</view>
-      </view>
-      <view class="icon-center">
-        <image
-          class="form-icon"
-          src="../../../static/mine/317.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.pontact }}</view>
-      </view>
-      <view class="icon-center" @click="toSetup">
-        <image
-          class="form-icon"
-          src="../../../static/mine/321.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.accountSettings }}</view>
-      </view>
-    </view>
-  </view>
+	<!-- 个人功能 -->
+	<view class="team">
+		<text class="team-title">{{ i18n.thatPerson }}</text>
+		<view class="function-team">
+			<view class="icon-center" @click="toSetleIn">
+				<image class="form-icon" src="../../../static/mine/322.png" mode=""></image>
+				<view class="characters">{{ i18n.become }}</view>
+			</view>
+			<view class="icon-center" @click="tokefu">
+				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
+				<view class="characters">{{ i18n.pontact }}</view>
+			</view>
+			<view class="icon-center" @click="toSetup">
+				<image class="form-icon" src="../../../static/mine/321.png" mode=""></image>
+				<view class="characters">{{ i18n.accountSettings }}</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {};
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  methods: {
-    toSetup() {
-      uni.navigateTo({
-        url: "/pageC/accountSetup/accountSetup",
-      });
-    },
+	export default {
+		data() {
+			return {};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		methods: {
+			tokefu() {
+				uni.navigateTo({
+					url: '/pageA/service/service'
+				})
+			},
+			toSetup() {
+				uni.navigateTo({
+					url: "/pageC/accountSetup/accountSetup",
+				});
+			},
 
-    toSetleIn() {
-      uni.$u.http.post(`/api/merchant/status`).then((res) => {
-        console.log(res);
-        if (res.status == 1 || res.status == 0 || res.status == 2) {
-          uni.navigateTo({
-            url: "/pageD/resultFeedback/resultFeedback",
-          });
-        } else {
-          uni.navigateTo({
-            url: "/pageD/settleIn/settleIn",
-          });
-        }
-      });
-    },
-  },
-};
+			toSetleIn() {
+				uni.$u.http.post(`/api/merchant/status`).then((res) => {
+					console.log(res);
+					if (res.status == 1 || res.status == 0 || res.status == 2) {
+						uni.navigateTo({
+							url: "/pageD/resultFeedback/resultFeedback",
+						});
+					} else {
+						uni.navigateTo({
+							url: "/pageD/settleIn/settleIn",
+						});
+					}
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-.team {
-  // height: 110px;
-  width: 100%;
-  background-color: #fff;
-  border-radius: 10px;
-  margin-top: 10px;
-  padding:14px 0;
-  .team-title {
-    color: #222;
-    font-size: 14px;
-    font-weight: 600;
-    display: block;
-    margin-left: 10px;
-  }
-  .function-team {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    .icon-center {
-      width: 18%;
-      margin-top: 18px;
-      display: flex;
-      flex-wrap: wrap;
-      padding: 0 10px;
-      justify-content: center;
-      flex-direction: column;
-      align-items: center;
-    }
-    .form-icon {
-      width: 24px;
-      height: 24px;
-    }
+	.team {
+		// height: 110px;
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10px;
+		margin-top: 10px;
+		padding: 14px 0;
 
-    .characters {
-      color: #202020;
-      font-size: 12px;
-      margin-top: 10px;
-	  text-align: center;
-    }
-  }
-}
-</style>
+		.team-title {
+			color: #222;
+			font-size: 14px;
+			font-weight: 600;
+			display: block;
+			margin-left: 10px;
+		}
+
+		.function-team {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+
+			.icon-center {
+				width: 18%;
+				margin-top: 18px;
+				display: flex;
+				flex-wrap: wrap;
+				padding: 0 10px;
+				justify-content: center;
+				flex-direction: column;
+				align-items: center;
+			}
+
+			.form-icon {
+				width: 24px;
+				height: 24px;
+			}
+
+			.characters {
+				color: #202020;
+				font-size: 12px;
+				margin-top: 10px;
+				text-align: center;
+			}
+		}
+	}
+</style>

unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.json

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

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

@@ -0,0 +1 @@
+(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/pageB/xieyi.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-parse": "/uview-ui/components/u-parse/u-parse"
+  }
+}

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

@@ -0,0 +1 @@
+<view class="page"><u-parse vue-id="7b2b963c-1" content="{{content}}" bind:__l="__l"></u-parse></view>

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

@@ -0,0 +1 @@
+.page{width:94vw;background-color:#fff;padding:0 24rpx;font-size:28rpx;color:#222;opacity:.6;min-height:calc(100vh)}

unpackage/dist/build/mp-weixin/pageD/components/remark.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/remark"],{"042e":function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var e=this,n=e.$createElement;e._self._c},r=[]},"0587":function(e,n,t){},"25a3":function(e,n,t){"use strict";var u=t("0587"),o=t.n(u);o.a},"4afd":function(e,n,t){"use strict";t.r(n);var u=t("042e"),o=t("fa1e");for(var r in o)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(r);t("25a3");var a,f=t("f0c5"),c=Object(f["a"])(o["default"],u["b"],u["c"],!1,null,"9df8fce2",null,!1,u["a"],a);n["default"]=c.exports},"8fec":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},data:function(){return{value1:""}}};n.default=u},fa1e:function(e,n,t){"use strict";t.r(n);var u=t("8fec"),o=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"]=o.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'pageD/components/remark-create-component',
+    {
+        'pageD/components/remark-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("4afd"))
+        })
+    },
+    [['pageD/components/remark-create-component']]
+]);

unpackage/dist/build/mp-weixin/pageD/components/remark.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u--textarea": "/uview-ui/components/u--textarea/u--textarea"
+  }
+}

unpackage/dist/build/mp-weixin/pageD/components/remark.wxml

@@ -0,0 +1 @@
+<u-popup vue-id="1950d1b6-1" show="{{show}}" mode="center" closeable="{{true}}" safeAreaInsetTop="{{true}}" round="{{10}}" data-event-opts="{{[['^close',[['$emit',['remarkClose']]]]]}}" bind:close="__e" class="data-v-9df8fce2" bind:__l="__l" vue-slots="{{['default']}}"><view style="width:500rpx;padding:20rpx;" class="data-v-9df8fce2"><u--textarea bind:input="__e" vue-id="{{('1950d1b6-2')+','+('1950d1b6-1')}}" placeholder="请输入内容" count="{{true}}" height="{{100}}" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-9df8fce2" bind:__l="__l"></u--textarea><view class="btn-list data-v-9df8fce2"><button data-event-opts="{{[['tap',[['$emit',['remarkClose']]]]]}}" class="btn-1 data-v-9df8fce2" bindtap="__e">取消</button><button data-event-opts="{{[['tap',[['$emit',['remarkClose','$0'],['value1']]]]]}}" class="btn-2 data-v-9df8fce2" bindtap="__e">确认</button></view></view></u-popup>

unpackage/dist/build/mp-weixin/pageD/components/remark.wxss

@@ -0,0 +1 @@
+.btn-list.data-v-9df8fce2{display:flex;justify-content:space-around;align-items:center;margin-top:20rpx}.btn-list .btn-1.data-v-9df8fce2{width:204rpx;height:72rpx;border-radius:42rpx;border:2rpx solid #f83224;background-color:#fff;line-height:72rpx;color:#f83224}.btn-list .btn-2.data-v-9df8fce2{width:204rpx;height:72rpx;border-radius:42rpx;border:2rpx solid #f83224;background-color:#f83224;line-height:72rpx;color:#fff}

unpackage/dist/build/mp-weixin/pageD/components/selectExpress.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/selectExpress"],{"2e11":function(e,t,n){"use strict";var f=n("f61a"),r=n.n(f);r.a},6929:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var f={name:"selectExpress",props:{show:{typeof:Boolean,default:!1},filterList:{typeof:Array,default:function(){return{}}},className:{typeof:String,default:""}}};t.default=f},8117:function(e,t,n){"use strict";var f;n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return a})),n.d(t,"a",(function(){return f}));var r=function(){var e=this,t=e.$createElement;e._self._c},a=[]},8683:function(e,t,n){"use strict";n.r(t);var f=n("8117"),r=n("cff5");for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);n("2e11");var u,c=n("f0c5"),o=Object(c["a"])(r["default"],f["b"],f["c"],!1,null,"3e0a6a6c",null,!1,f["a"],u);t["default"]=o.exports},cff5:function(e,t,n){"use strict";n.r(t);var f=n("6929"),r=n.n(f);for(var a in f)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return f[e]}))}(a);t["default"]=r.a},f61a:function(e,t,n){}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'pageD/components/selectExpress-create-component',
+    {
+        'pageD/components/selectExpress-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("8683"))
+        })
+    },
+    [['pageD/components/selectExpress-create-component']]
+]);

unpackage/dist/build/mp-weixin/pageD/components/selectExpress.json

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

unpackage/dist/build/mp-weixin/pageD/components/selectExpress.wxml

@@ -0,0 +1 @@
+<block wx:if="{{show}}"><view class="{{['data-v-3e0a6a6c',className]}}"><block wx:for="{{filterList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['$emit',['selected','$0'],[[['filterList','',index]]]]]]]}}" class="_label data-v-3e0a6a6c" catchtap="__e">{{item.name+''}}</view></block></view></block>

unpackage/dist/build/mp-weixin/pageD/components/selectExpress.wxss

@@ -0,0 +1 @@
+.select-list.data-v-3e0a6a6c{background-color:#fff;border-radius:10rpx;padding:14rpx;position:absolute;bottom:200rpx;right:70rpx;z-index:1000;width:300rpx;height:220rpx;overflow-y:auto;box-shadow:0 0 4rpx #b6b5b5}.select-list ._label.data-v-3e0a6a6c{font-size:28rpx;color:#000;margin:20rpx;text-align:center}.sending-name.data-v-3e0a6a6c{background-color:#fff;border-radius:10rpx;padding:14rpx;position:absolute;top:200rpx;left:70rpx;z-index:1000;width:300rpx;height:220rpx;overflow-y:auto;box-shadow:0 0 4rpx #b6b5b5}.sending-name ._label.data-v-3e0a6a6c{font-size:28rpx;color:#000;margin:20rpx;text-align:center}.order-manage.data-v-3e0a6a6c{background-color:#fff;border-radius:10rpx;padding:14rpx;position:absolute;bottom:100rpx;right:70rpx;z-index:1000;width:300rpx;height:220rpx;overflow-y:auto;box-shadow:0 0 4rpx #b6b5b5}.order-manage ._label.data-v-3e0a6a6c{font-size:28rpx;color:#000;margin:20rpx;text-align:center}

unpackage/dist/build/mp-weixin/pageD/joinPlatfrom/joinPlatfrom.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/joinPlatfrom/joinPlatfrom"],{"3ad3":function(e,t,n){"use strict";n.r(t);var a=n("5dd0"),r=n.n(a);for(var u in a)["default"].indexOf(u)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(u);t["default"]=r.a},"3b54":function(e,t,n){"use strict";n.r(t);var a=n("a3ac"),r=n("3ad3");for(var u in r)["default"].indexOf(u)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(u);var o,i=n("f0c5"),c=Object(i["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],o);t["default"]=c.exports},"5dd0":function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={data:function(){return{agreement:""}},methods:{getAgreement:function(){var t=this;e.$u.http.get("/api/agreement?code=entry_agreement").then((function(e){t.agreement=e.content_cn}))}},mounted:function(){this.getAgreement(),e.setNavigationBarTitle({title:"用户入驻申请协议"})}};t.default=n}).call(this,n("543d")["default"])},6710:function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("f93b");a(n("66fd"));var r=a(n("3b54"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},a3ac:function(e,t,n){"use strict";n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return u})),n.d(t,"a",(function(){return a}));var a={uParse:function(){return Promise.all([n.e("common/vendor"),n.e("uview-ui/components/u-parse/u-parse")]).then(n.bind(null,"0d5f"))}},r=function(){var e=this,t=e.$createElement;e._self._c},u=[]}},[["6710","common/runtime","common/vendor"]]]);

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

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {
+    "u-parse": "/uview-ui/components/u-parse/u-parse"
+  }
+}

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

@@ -0,0 +1 @@
+<view><u-parse vue-id="58760a22-1" content="{{agreement}}" bind:__l="__l"></u-parse></view>

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{"0fd8":function(n,t,e){"use strict";e.r(t);var r=e("263a"),u=e("58e4");for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("948b");var a,o=e("f0c5"),f=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"59d7100c",null,!1,r["a"],a);t["default"]=f.exports},"263a":function(n,t,e){"use strict";var r;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=[]},3589:function(n,t,e){},"58e4":function(n,t,e){"use strict";e.r(t);var r=e("694c"),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},"694c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={props:{goodsList:{typeof:Array,default:function(){return[]}}}};t.default=r},"948b":function(n,t,e){"use strict";var r=e("3589"),u=e.n(r);u.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'pageD/newBulitOrder/component/commodity-create-component',
+    {
+        'pageD/newBulitOrder/component/commodity-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("0fd8"))
+        })
+    },
+    [['pageD/newBulitOrder/component/commodity-create-component']]
+]);

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.json

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

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.wxml

@@ -0,0 +1 @@
+<view class="list data-v-59d7100c"><view class="merchant data-v-59d7100c"><image class="merchant-img data-v-59d7100c" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-59d7100c">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.order_goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="detail data-v-59d7100c"><image class="detail-img data-v-59d7100c" src="{{item.sku_item.image}}" mode></image><view style="flex-direction:column;justify-content:space-between;height:184rpx;display:flex;flex:1;" class="data-v-59d7100c"><view class="data-v-59d7100c"><text class="toptitle data-v-59d7100c">{{item.goods.name_cn}}</text><view class="weight data-v-59d7100c">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-59d7100c"><view class="data-v-59d7100c"><text class="money data-v-59d7100c">¥</text><text class="money data-v-59d7100c" style="font-size:34rpx;">{{item.sku_item.price}}</text></view><view class="data-v-59d7100c">{{'x '+item.goods_num}}</view></view></view></view></block></view>

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.wxss

@@ -0,0 +1 @@
+.list.data-v-59d7100c{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:28rpx 26rpx 36rpx 24rpx}.list .merchant.data-v-59d7100c{display:flex;justify-content:flex-start}.list .merchant .merchant-img.data-v-59d7100c{width:38rpx;height:38rpx;margin-right:16rpx}.list .merchant .merchant-name.data-v-59d7100c{font-size:30rpx;color:#222}.list .detail.data-v-59d7100c{margin-top:32rpx;display:flex}.list .detail .detail-img.data-v-59d7100c{width:184rpx;height:184rpx;margin-right:24rpx}

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

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "commodity": "/pageD/newBulitOrder/component/commodity"
+  }
+}

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

@@ -0,0 +1 @@
+<view class="page data-v-54e1ff80"><view data-event-opts="{{[['tap',[['toadd',['$event']]]]]}}" class="address data-v-54e1ff80" bindtap="__e"><view class="u-flex u-row-between data-v-54e1ff80"><block wx:if="{{$root.g0!='{}'}}"><view class="add data-v-54e1ff80">{{addinfo.full_address}}</view></block><block wx:else><view class="data-v-54e1ff80">{{i18n.shippingaddress}}</view></block><u-icon vue-id="792b6479-1" name="arrow-right" size="16" class="data-v-54e1ff80" bind:__l="__l"></u-icon></view><block wx:if="{{$root.g1!='{}'}}"><view class="info data-v-54e1ff80"><text class="data-v-54e1ff80">{{addinfo.name}}</text><text style="margin-left:20rpx;" class="data-v-54e1ff80">{{$root.m0}}</text></view></block></view><commodity vue-id="792b6479-2" goodsList="{{goodsList}}" class="data-v-54e1ff80" bind:__l="__l"></commodity></view>

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

@@ -0,0 +1 @@
+.page.data-v-54e1ff80{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box}.page .address.data-v-54e1ff80{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-54e1ff80{font-family:SFPro;font-weight:500;font-size:32rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal}.page .address .info.data-v-54e1ff80{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}

unpackage/dist/build/mp-weixin/pageD/orderInformation/component/fill.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u--input": "/uview-ui/components/u--input/u--input",
+    "select-express": "/pageD/components/selectExpress"
+  }
+}

unpackage/dist/build/mp-weixin/pageD/orderInformation/component/fill.wxml

@@ -0,0 +1 @@
+<view class="data-v-5aedd179"><u-popup vue-id="035adf58-1" show="{{show}}" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['$emit',['close']]]]]}}" bind:close="__e" class="data-v-5aedd179" bind:__l="__l" vue-slots="{{['default']}}"><view class="title data-v-5aedd179">填写快递信息</view><view class="content data-v-5aedd179"><view data-event-opts="{{[['tap',[['openSelect',['$event']]]]]}}" class="_label data-v-5aedd179" bindtap="__e"><view class="name data-v-5aedd179">快递公司</view><u--input vue-id="{{('035adf58-2')+','+('035adf58-1')}}" placeholder="请选择快递公司" border="none" inputAlign="right" value="{{expressName}}" data-event-opts="{{[['^change',[['searchExpress']]],['^input',[['__set_model',['','expressName','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-5aedd179" bind:__l="__l"></u--input></view><view class="_label data-v-5aedd179"><view class="name data-v-5aedd179">快递单号</view><u--input bind:input="__e" vue-id="{{('035adf58-3')+','+('035adf58-1')}}" placeholder="请填写快递单号" border="none" inputAlign="right" value="{{expressNum}}" data-event-opts="{{[['^input',[['__set_model',['','expressNum','$event',[]]]]]]}}" class="data-v-5aedd179" bind:__l="__l"></u--input></view><select-express vue-id="{{('035adf58-4')+','+('035adf58-1')}}" show="{{nameShow}}" filterList="{{filterList}}" className="select-list" data-event-opts="{{[['^selected',[['selected']]]]}}" bind:selected="__e" class="data-v-5aedd179" bind:__l="__l"></select-express></view><button data-event-opts="{{[['tap',[['$emit',['close',['o',['expressCode',expressCode],['expressNum',expressNum]]]]]]]}}" class="btn data-v-5aedd179" bindtap="__e">立即保存</button></u-popup></view>

unpackage/dist/build/mp-weixin/pageD/orderInformation/component/fill.wxss

@@ -0,0 +1 @@
+.title.data-v-5aedd179{height:100rpx;text-align:center;line-height:100rpx;font-size:36rpx;color:#222;font-weight:600}.content.data-v-5aedd179{padding:0 32rpx;margin-bottom:126rpx;position:relative}.content ._label.data-v-5aedd179{display:flex;justify-content:space-around;align-items:center;height:100rpx;margin-top:16rpx 24rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.content ._label .name.data-v-5aedd179{color:#555;font-size:30rpx}.btn.data-v-5aedd179{background-color:#f83224;color:#fff;border-radius:44rpx;margin:0 auto 50rpx;width:90%}

unpackage/dist/build/mp-weixin/pageD/userAgreement/userAgreement.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/userAgreement/userAgreement"],{"383f":function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={data:function(){return{agreemaent:""}},methods:{getAgree:function(){var t=this;e.$u.http.get("/api/agreement?code=user").then((function(e){t.agreemaent=e.content_cn}))}},mounted:function(){e.setNavigationBarTitle({title:"用户协议"}),this.getAgree()}};t.default=n}).call(this,n("543d")["default"])},7820:function(e,t,n){"use strict";n.r(t);var u=n("383f"),r=n.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return u[e]}))}(a);t["default"]=r.a},8176:function(e,t,n){"use strict";(function(e,t){var u=n("4ea4");n("f93b");u(n("66fd"));var r=u(n("f73b"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},d41a:function(e,t,n){"use strict";n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return a})),n.d(t,"a",(function(){return u}));var u={uParse:function(){return Promise.all([n.e("common/vendor"),n.e("uview-ui/components/u-parse/u-parse")]).then(n.bind(null,"0d5f"))}},r=function(){var e=this,t=e.$createElement;e._self._c},a=[]},f73b:function(e,t,n){"use strict";n.r(t);var u=n("d41a"),r=n("7820");for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);var i,c=n("f0c5"),o=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],i);t["default"]=o.exports}},[["8176","common/runtime","common/vendor"]]]);

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

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {
+    "u-parse": "/uview-ui/components/u-parse/u-parse"
+  }
+}

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

@@ -0,0 +1 @@
+<u-parse vue-id="77ea2e8f-1" content="{{agreemaent}}" bind:__l="__l"></u-parse>

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uni_modules/lime-painter/components/l-painter-image/l-painter-image"],{1231:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=t("58ce"),i={name:"lime-painter-image",mixins:[(0,r.children)("painter")],props:{id:String,css:[String,Object],src:String},data:function(){return{type:"image",el:{css:{},src:null}}}};e.default=i},"23cb":function(n,e,t){"use strict";t.r(e);var r=t("29ad"),i=t("80c7");for(var a in i)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return i[n]}))}(a);var u,c=t("f0c5"),l=Object(c["a"])(i["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],u);e["default"]=l.exports},"29ad":function(n,e,t){"use strict";var r;t.d(e,"b",(function(){return i})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return r}));var i=function(){var n=this,e=n.$createElement;n._self._c},a=[]},"80c7":function(n,e,t){"use strict";t.r(e);var r=t("1231"),i=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"]=i.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'uni_modules/lime-painter/components/l-painter-image/l-painter-image-create-component',
+    {
+        'uni_modules/lime-painter/components/l-painter-image/l-painter-image-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("23cb"))
+        })
+    },
+    [['uni_modules/lime-painter/components/l-painter-image/l-painter-image-create-component']]
+]);

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.json

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

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.wxml

@@ -0,0 +1 @@
+<view class="_div"></view>

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode"],{"12b3":function(n,t,e){"use strict";e.r(t);var r=e("58c6c"),c=e.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);t["default"]=c.a},"58c6c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=e("58ce"),c={name:"lime-painter-qrcode",mixins:[(0,r.children)("painter")],props:{id:String,css:[String,Object],text:String},data:function(){return{type:"qrcode",el:{css:{},text:null}}}};t.default=c},a14a:function(n,t,e){"use strict";e.r(t);var r=e("d014"),c=e("12b3");for(var i in c)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(i);var u,a=e("f0c5"),o=Object(a["a"])(c["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],u);t["default"]=o.exports},d014:function(n,t,e){"use strict";var r;e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return r}));var c=function(){var n=this,t=n.$createElement;n._self._c},i=[]}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode-create-component',
+    {
+        'uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("a14a"))
+        })
+    },
+    [['uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode-create-component']]
+]);

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.json

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

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.wxml

@@ -0,0 +1 @@
+<view class="_div"></view>

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-text/l-painter-text.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uni_modules/lime-painter/components/l-painter-text/l-painter-text"],{5062:function(t,e,n){"use strict";n.r(e);var r=n("79cb"),u=n("679f");for(var i in u)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(i);var c,a=n("f0c5"),l=Object(a["a"])(u["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],c);e["default"]=l.exports},"679f":function(t,e,n){"use strict";n.r(e);var r=n("70c0"),u=n.n(r);for(var i in r)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(i);e["default"]=u.a},"70c0":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=n("58ce"),u={name:"lime-painter-text",mixins:[(0,r.children)("painter")],props:{type:{type:String,default:"text"},uid:String,css:[String,Object],text:[String,Number],replace:Object},data:function(){return{el:{css:{},text:null}}}};e.default=u},"79cb":function(t,e,n){"use strict";var r;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return r}));var u=function(){var t=this,e=t.$createElement;t._self._c},i=[]}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'uni_modules/lime-painter/components/l-painter-text/l-painter-text-create-component',
+    {
+        'uni_modules/lime-painter/components/l-painter-text/l-painter-text-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("5062"))
+        })
+    },
+    [['uni_modules/lime-painter/components/l-painter-text/l-painter-text-create-component']]
+]);

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-text/l-painter-text.json

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

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-text/l-painter-text.wxml

@@ -0,0 +1 @@
+<text style="opacity:0;height:0;"><slot></slot></text>

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json

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

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.wxml

@@ -0,0 +1 @@
+<view data-ref="limepainter" class="lime-painter vue-ref"><block wx:if="{{canvasId&&size}}"><view style="{{(styles)}}"><block wx:if="{{use2dCanvas}}"><canvas class="lime-painter__canvas" style="{{(size)}}" id="{{canvasId}}" type="2d"></canvas></block><block wx:else><canvas class="lime-painter__canvas" style="{{(size)}}" id="{{canvasId}}" canvas-id="{{canvasId}}" width="{{boardWidth*dpr}}" height="{{boardHeight*dpr}}" hidpi="{{hidpi}}"></canvas></block></view></block><slot></slot></view>

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.wxss

@@ -0,0 +1,2 @@
+.lime-painter,
+.lime-painter__canvas{width:100%}

unpackage/dist/build/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

unpackage/dist/build/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.wxml

@@ -0,0 +1 @@
+<view class="uni-stat__select"><block wx:if="{{label}}"><label class="uni-label-text hide-on-phone _span">{{label+'：'}}</label></block><view class="{{['uni-stat-box',(current)?'uni-stat__actived':'']}}"><view class="{{['uni-select',(disabled)?'uni-select--disabled':'']}}"><view data-event-opts="{{[['tap',[['toggleSelector',['$event']]]]]}}" class="uni-select__input-box" bindtap="__e"><block wx:if="{{current}}"><view class="uni-select__input-text">{{textShow}}</view></block><block wx:else><view class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view></block><block wx:if="{{current&&clear&&!disabled}}"><view data-event-opts="{{[['tap',[['clearVal',['$event']]]]]}}" catchtap="__e"><uni-icons vue-id="011c9238-1" type="clear" color="#c0c4cc" size="24" bind:__l="__l"></uni-icons></view></block><block wx:else><view><uni-icons vue-id="011c9238-2" type="{{showSelector?'top':'bottom'}}" size="14" color="#999" bind:__l="__l"></uni-icons></view></block></view><block wx:if="{{showSelector}}"><view data-event-opts="{{[['tap',[['toggleSelector',['$event']]]]]}}" class="uni-select--mask" bindtap="__e"></view></block><block wx:if="{{showSelector}}"><view class="uni-select__selector" style="{{(getOffsetByPlacement)}}"><view class="{{[placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top']}}"></view><scroll-view class="uni-select__selector-scroll" scroll-y="true"><block wx:if="{{$root.g0===0}}"><view class="uni-select__selector-empty"><text>{{emptyTips}}</text></view></block><block wx:else><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['change',['$0'],[[['mixinDatacomResData','',index]]]]]]]}}" class="uni-select__selector-item" bindtap="__e"><text class="{{[(item.$orig.disable)?'uni-select__selector__disabled':'']}}">{{item.m0}}</text></view></block></block></scroll-view></view></block></view></view></view>

unpackage/dist/build/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.wxss

@@ -0,0 +1,6 @@
+@media screen and (max-width:500px){.hide-on-phone{display:none}}.uni-stat__select{display:flex;align-items:center;width:100%;flex:1;box-sizing:border-box}.uni-stat-box{width:100%;flex:1}.uni-stat__actived{width:100%;flex:1}.uni-label-text{font-size:14px;font-weight:700;color:#6a6a6a;margin:auto 0;margin-right:5px}.uni-select{font-size:14px;border:1px solid #e5e5e5;box-sizing:border-box;border-radius:4px;padding:0 5px;padding-left:10px;position:relative;display:flex;-webkit-user-select:none;user-select:none;flex-direction:row;align-items:center;border-bottom:solid 1px #e5e5e5;width:100%;flex:1;height:35px}.uni-select--disabled{background-color:#f5f7fa;cursor:not-allowed}.uni-select__label{font-size:16px;height:35px;padding-right:10px;color:#909399}.uni-select__input-box{height:35px;position:relative;display:flex;flex:1;flex-direction:row;align-items:center}.uni-select__input{flex:1;font-size:14px;height:22px;line-height:22px}.uni-select__input-plac{font-size:14px;color:#909399}.uni-select__selector{box-sizing:border-box;position:absolute;left:0;width:100%;background-color:#fff;border:1px solid #ebeef5;border-radius:6px;box-shadow:0 2px 12px 0 rgba(0,0,0,.1);z-index:3;padding:4px 0}.uni-select__selector-scroll{max-height:200px;box-sizing:border-box}.uni-select__selector-empty,
+.uni-select__selector-item{display:flex;cursor:pointer;line-height:35px;font-size:14px;text-align:center;padding:0 10px}.uni-select__selector-item:hover{background-color:#f9f9f9}.uni-select__selector-empty:last-child,
+.uni-select__selector-item:last-child{border-bottom:none}.uni-select__selector__disabled{opacity:.4;cursor:default}.uni-popper__arrow_bottom,
+.uni-popper__arrow_bottom::after,
+.uni-popper__arrow_top,
+.uni-popper__arrow_top::after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid;border-width:6px}.uni-popper__arrow_bottom{-webkit-filter:drop-shadow(0 2px 12px rgba(0,0,0,.03));filter:drop-shadow(0 2px 12px rgba(0,0,0,.03));top:-6px;left:10%;margin-right:3px;border-top-width:0;border-bottom-color:#ebeef5}.uni-popper__arrow_bottom::after{content:" ";top:1px;margin-left:-6px;border-top-width:0;border-bottom-color:#fff}.uni-popper__arrow_top{-webkit-filter:drop-shadow(0 2px 12px rgba(0,0,0,.03));filter:drop-shadow(0 2px 12px rgba(0,0,0,.03));bottom:-6px;left:10%;margin-right:3px;border-bottom-width:0;border-top-color:#ebeef5}.uni-popper__arrow_top::after{content:" ";bottom:1px;margin-left:-6px;border-bottom-width:0;border-top-color:#fff}.uni-select__input-text{width:100%;color:#333;white-space:nowrap;text-overflow:ellipsis;-o-text-overflow:ellipsis;overflow:hidden}.uni-select__input-placeholder{color:#6a6a6a;font-size:12px}.uni-select--mask{position:fixed;top:0;bottom:0;right:0;left:0;z-index:2}

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

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-line": "/uview-ui/components/u-line/u-line",
+    "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon"
+  }
+}

unpackage/dist/build/mp-weixin/uview-ui/components/u-modal/u-modal.wxss

@@ -0,0 +1 @@
+view.data-v-59d74e64, scroll-view.data-v-59d74e64, swiper-item.data-v-59d74e64{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-modal.data-v-59d74e64{width:650rpx;border-radius:6px;overflow:hidden}.u-modal__title.data-v-59d74e64{font-size:16px;font-weight:700;color:#606266;text-align:center;padding-top:25px}.u-modal__content.data-v-59d74e64{padding:12px 25px 25px 25px;display:flex;flex-direction:row;justify-content:center}.u-modal__content__text.data-v-59d74e64{font-size:15px;color:#606266;flex:1}.u-modal__button-group.data-v-59d74e64{display:flex;flex-direction:row}.u-modal__button-group--confirm-button.data-v-59d74e64{flex-direction:column;padding:0 25px 15px 25px}.u-modal__button-group__wrapper.data-v-59d74e64{flex:1;display:flex;flex-direction:row;justify-content:center;align-items:center;height:48px}.u-modal__button-group__wrapper--confirm.data-v-59d74e64, .u-modal__button-group__wrapper--only-cancel.data-v-59d74e64{border-bottom-right-radius:6px}.u-modal__button-group__wrapper--cancel.data-v-59d74e64, .u-modal__button-group__wrapper--only-confirm.data-v-59d74e64{border-bottom-left-radius:6px}.u-modal__button-group__wrapper--hover.data-v-59d74e64{background-color:#f3f4f6}.u-modal__button-group__wrapper__text.data-v-59d74e64{color:#606266;font-size:16px;text-align:center}