冲突

commont/http.interceptor.js

@@ -3,8 +3,8 @@ module.exports = (vm) => {
   // 初始化请求配置
   uni.$u.http.setConfig((config) => {
     /* config 为默认全局配置*/
-    // config.baseURL = "https://cbec.hdlkeji.com"; /* 根域名 */
-    config.baseURL = "https://cbec-test.hdlkeji.com"; /* 根域名，测试地址 */
+    config.baseURL = "https://cbec.hdlkeji.com"; /* 根域名 */
+    // config.baseURL = "https://cbec-test.hdlkeji.com"; /* 根域名，测试地址 */
     return config;
   });
 

commont/url.js

@@ -1,4 +1,3 @@
 var url = 'https://cbec.hdlkeji.com'
 // var url = 'https://goufangtong.hdlkeji.com'
-export default url
-  
+export default url

components/kj-chat/kj-chat.vue

@@ -123,9 +123,9 @@
 		conn,
 	} from '@/utils/WebIM';
 	import WebIM from '@/newSDK/Easemob-chat-4.1.7.js'
-	import emoji from "@/commont/emoji.js"
+	import emoji from "@/commont/emoji.js"   
 	const recorderManager = uni.getRecorderManager()
-	var init // 录制时长计时器
+	var init // 录制时长计时器    
 
 	export default {
 		props: {
@@ -135,7 +135,7 @@
 			},
 
 			list: {
-				typeof: Array,
+				typeof: Array,                                                                                                                                                                                 
 				default: []
 			},
 			user_other: {

components/kj-express/kj-express.vue

@@ -183,7 +183,7 @@
               padding-right: 0 !important;
               margin: 0 !important;
             "
-            open-type="share"
+            open-type="share"  
             class="u-flex"
           >
             <image
@@ -430,6 +430,7 @@
           :leftchangea="leftchange"
           :rightchangea="rightchange"
           :typeida="typeid"
+		  :country_id='country_id'
         ></kj-flow>
       </view>
     </u-popup>
@@ -456,6 +457,7 @@ export default {
       topadd: {}, //新建寄件人
       bottomadd: {}, //新建收件人
       province_id: "",
+	  country_id:'',
       leftname: "",
       rightname: "",
       container_id: "", //货柜列表
@@ -622,6 +624,7 @@ export default {
       this.topadd = this.bottomadd;
       this.bottomadd = a;
       this.province_id = this.bottomadd.province_id;
+      this.country_id = this.bottomadd.country_id;
     },
     //正则匹配手机号
     replacePhoneToStar: function (phone) {
@@ -643,6 +646,7 @@ export default {
               that.bottomadd = res;
               console.log("bottom", that.bottomadd);
               that.province_id = that.bottomadd.province_id;
+              that.country_id = that.bottomadd.country_id;
             }
           },
         },
@@ -774,6 +778,7 @@ export default {
               console.log(res);
               that.bottomadd = res;
               that.province_id = res.province_id;
+              that.country_id = res.country_id;
             },
           },
         });
@@ -785,6 +790,7 @@ export default {
               console.log(res);
               that.bottomadd = res;
               that.province_id = res.province_id;
+              that.country_id = res.country_id;
             },
           },
         });

components/kj-flow/kj-flow.vue

@@ -5,7 +5,7 @@
 			<view class="title">{{i18n.flow}}</view>
 			<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
 		</view>
-		<view class="u-flex" style="margin-top: 56rpx;">
+		<view v-if="transportList.length>0" class="u-flex" style="margin-top: 56rpx;">
 			<scroll-view scroll-y="true" class="left">
 				<view v-for="(item,idx) in transportList" :key="idx" @click="changea(item,idx)"
 					style="height: 134rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;"
@@ -32,7 +32,7 @@
 					style="display: flex;flex-direction: column;align-items: center;justify-content: center;padding: 20rpx 0 16rpx;"
 					class="iitem">
 					<view class="ititle u-flex u-row-between" style="width: 100%;">
-						<view class="ititle">{{i18n.Shipmentdate}}: {{item.begin_date}}</view>
+						<view class="ititle">{{i18n.Shipmentdate}}: {{item.estimated_departed_date}}</view>
 						<view v-if="language =='zh-CN'" style="font-size: 24rpx;
 color: #666666;">{{item.name_cn}}</view>
 						<view v-if="language =='en-US'" style="font-size: 24rpx;
@@ -56,6 +56,7 @@ color: #666666;">{{item.name_ita}}</view>
 				</view>
 			</scroll-view>
 		</view>
+		<view class="" v-else style="height: 300rpx;text-align: center;line-height: 300rpx;font-size: 24rpx;">{{i18n.nodata}}</view>
 		<view class="bottom">
 			<view class="btn" @click="enter">{{i18n.enter}}</view>
 		</view>
@@ -69,6 +70,9 @@ color: #666666;">{{item.name_ita}}</view>
 			province_id: {
 				typeof: Number
 			},
+			country_id: {
+				typeof: Number
+			},
 			goodstype: {
 				typeof: String,
 				default: "normal"
@@ -127,6 +131,7 @@ color: #666666;">{{item.name_ita}}</view>
 					params: {
 						is_page: 0,
 						province_id: this.province_id,
+						country_id:this.country_id,
 						transport_type_id: id,
 						type: this.goodstype
 					}
@@ -153,7 +158,12 @@ color: #666666;">{{item.name_ita}}</view>
 				})
 			},
 			transport() {
-				uni.$u.http.get('/api/transport-type').then((res) => {
+				uni.$u.http.get('/api/transport-type',{
+					params:{
+						province_id:this.province_id,
+						country_id:this.country_id
+					}
+				}).then((res) => {
 					this.transportList = res
 					if (this.typeida) {
 						console.log(this.typeida);

components/kj-index/kj-index.vue

@@ -32,7 +32,7 @@
 		<view class="shopback">
 			<view class="u-flex u-row-between">
 				<!-- 百亿补贴 -->
-				<view class="bigbox" @click="subsidy(1)">
+				<view class="bigbox" style="height: 468rpx;" @click="subsidy(1)">
 					<view class="u-flex">
 						<image v-if="language=='zh-CN'" src="../../static/images/index/butie.png"
 							style="width: 104rpx;height: 26rpx;" mode="">

components/kj-tabbar/kj-tabbar.vue

@@ -1,397 +1,379 @@
 <template>
-  <view id="tabber" style="position: fixed; z-index: 1000; bottom: 0">
-    <view class="bottom u-flex u-row-between" v-if="value1 == 2">
-      <view class="u-flex">
-        <u-checkbox-group v-model="all" placement="column" @change="checkAll">
-          <u-checkbox
-            shape="circle"
-            :name="i18n.selectall"
-            activeColor="#F83224"
-          >
-          </u-checkbox>
-        </u-checkbox-group>
-        <text class="all">{{ i18n.selectall }}</text>
-      </view>
-      <view v-if="!success" class="dle" @click="$emit('selectDelete')">
-        {{ i18n.delete }}
-      </view>
-      <view class="u-flex" v-else>
-        <view class="">
-          <text class="allweight">{{ i18n.Grossweight }} </text>
-          <text class="allweight"> {{ goodsWeight }}kg,</text>
-          <text class="sum">{{ i18n.total }}:</text>
-          <text class="summon">¥</text>
-          <text class="summon" style="font-size: 36rpx">{{
+	<view id="tabber" style="position: fixed; z-index: 1000; bottom: 0">
+		<view class="bottom u-flex u-row-between" v-if="value1 == 2">
+			<view class="u-flex">
+				<u-checkbox-group v-model="all" placement="column" @change="checkAll">
+					<u-checkbox shape="circle" :name="i18n.selectall" activeColor="#F83224">
+					</u-checkbox>
+				</u-checkbox-group>
+				<text class="all">{{ i18n.selectall }}</text>
+			</view>
+			<view v-if="!success" class="dle" @click="$emit('selectDelete')">
+				{{ i18n.delete }}
+			</view>
+			<view class="u-flex" v-else>
+				<view class="">
+					<text class="allweight">{{ i18n.Grossweight }} </text>
+					<text class="allweight"> {{ goodsWeight }}kg,</text>
+					<text class="sum">{{ i18n.total }}:</text>
+					<text class="summon">¥</text>
+					<text class="summon" style="font-size: 36rpx">{{
             goodsPrice.split(".")[0]
           }}</text>
-          <text class="summon">.{{ goodsPrice.split(".")[1] }}</text>
-        </view>
-        <view class="settle" @click="account">{{ i18n.GotoResult }}</view>
-      </view>
-    </view>
-    <u-tabbar
-      :list="list"
-      active-color="#F83224"
-      inactive-color="#333"
-      :value="value1"
-    >
-      <u-tabbar-item
-        v-for="(item, idx) in list"
-        @click="click1"
-        :key="idx"
-        :text="item.text"
-        :badge="item.text == '购物车' ? badgeNumber : 0"
-      >
-        <image
-          style="width: 40rpx; height: 40rpx"
-          class="u-page__item__slot-icon"
-          slot="inactive-icon"
-          :src="item.iconPath"
-        ></image>
+					<text class="summon">.{{ goodsPrice.split(".")[1] }}</text>
+				</view>
+				<view class="settle" @click="account">{{ i18n.GotoResult }}</view>
+			</view>
+		</view>
+		<u-tabbar :list="list" active-color="#F83224" inactive-color="#333" :value="value1">
+			<u-tabbar-item v-for="(item, idx) in list" @click="click1" :key="idx" :text="item.text"
+				:badge="item.text == '购物车' ? badgeNumber : 0">
+				<image style="width: 40rpx; height: 40rpx" class="u-page__item__slot-icon" slot="inactive-icon"
+					:src="item.iconPath"></image>
 
-        <image
-          style="width: 40rpx; height: 40rpx"
-          class="u-page__item__slot-icon"
-          slot="active-icon"
-          :src="item.selectedIconPath"
-        ></image>
-      </u-tabbar-item>
-    </u-tabbar>
-  </view>
+				<image style="width: 40rpx; height: 40rpx" class="u-page__item__slot-icon" slot="active-icon"
+					:src="item.selectedIconPath"></image>
+			</u-tabbar-item>
+		</u-tabbar>
+	</view>
 </template>
 <script>
-import { nextTick } from "vue";
-import { mapState } from "vuex";
+	import {
+		nextTick
+	} from "vue";
+	import {
+		mapState
+	} from "vuex";
 
-export default {
-  name: "kj-tabbar",
-  props: {
-    value1: {
-      type: Number,
-      default: 0,
-    },
-    goodsWeight: {
-      type: Number,
-      default: 0,
-    },
-    goodsPrice: {
-      type: String,
-      default: "",
-    },
-    //购物车所有商品
-    goodsList: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-    //购物车选中的商品
-    checkboxValue1: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-    success: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  data() {
-    return {
-      all: [],
-      language: "zh-CN",
-      selegoods: [],
-      stringcheck: [],
-      skuitemid: [],
-      volume: "",
-      cartid: [],
-      ten_yuan_image: "",
-      badgeNumber: 0, //购物车商品数量
-    };
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-    list() {
-      var list = [
-        // {
-        // 	iconPath: "../../static/express1.png",
-        // 	selectedIconPath: "../../static/express2.png",
-        // 	text: "跨境速递",
-        // 	pagePath: "pages/express/express",
-        // },
-        {
-          iconPath: "../../static/index1.png",
-          selectedIconPath: "../../static/index2.png",
-          text: "商城",
-          pagePath: "pages/index/index",
-        },
-        {
-          iconPath: "../../static/shop.png",
-          selectedIconPath: "../../static/shop.png",
-          text: "购",
-          pagePath: "pages/shopping/shopping",
-        },
-        {
-          iconPath: "../../static/cart1.png",
-          selectedIconPath: "../../static/cart2.png",
-          text: "购物车",
-          pagePath: "pages/cart/cart",
-        },
-        {
-          iconPath: "../../static/mine1.png",
-          selectedIconPath: "../../static/mine2.png",
-          text: "我的",
-          pagePath: "pages/mine/mine",
-        },
-      ];
-      list[1].iconPath = this.ten_yuan_image;
-      list[1].selectedIconPath = this.ten_yuan_image;
-      list[0].text = this.i18n.shop;
-      list[1].text = this.i18n.chase;
-      list[2].text = this.i18n.Shopping;
-      list[3].text = this.i18n.mine;
-      return list;
-    },
-  },
-  created() {
-    this.all = [];
-    if (uni.getStorageSync("language") != "") {
-      this.language = uni.getStorageSync("language");
-    }
-    this.getimage();
-    this.getNumber();
-  },
-  methods: {
-    getimage() {
-      uni.$u.http
-        .get("/api/config", {
-          params: {
-            module: "basic",
-          },
-        })
-        .then((res) => {
-          this.ten_yuan_image = res.ten_yuan_image;
-        })
-        .catch(() => {});
-    },
-    account() {
-      if (this.checkboxValue1.length == 0) {
-        this.$u.toast("请选择商品");
-      } else {
-        this.selegoods = [];
-        this.skuitemid = [];
-        this.cartid = [];
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            console.log("items", items);
-            if (this.checkboxValue1.indexOf(items.cart.id) > -1) {
-              this.selegoods = this.selegoods.concat(items);
-              this.stringcheck = this.stringcheck.concat(items.cart.id);
-              this.skuitemid = this.skuitemid.concat(items.cart.sku_item_id);
-              // if (items.is_shipping == 1 && item.goods.length>1) {
-              this.cartid = this.cartid.concat(items.cart.id);
-            }
-          });
-        });
-        uni.$u.http
-          .get(
-            `/api/order_goods_volume?sku_item_id=` + this.skuitemid.toString(),
-            {}
-          )
-          .then((res) => {
-            console.log("weight", res);
-            this.volume = res;
-          });
-        this.$nextTick(() => {
-          uni.navigateTo({
-            url:
-              "/pageA/order?selelist=" +
-              encodeURIComponent(JSON.stringify(this.selegoods)) +
-              "&typea=" +
-              "shop" +
-              "&goodsPrice=" +
-              this.goodsPrice +
-              "&goodsWeight=" +
-              this.goodsWeight +
-              "&stringcheck=" +
-              this.stringcheck.toString() +
-              "&volume=" +
-              this.volume +
-              "&cartid=" +
-              this.cartid.join(","),
-          });
-        });
-      }
-    },
-    //获取购物车数量
-    getNumber() {
-      uni.$u.http.get(`/api/cart/number`).then((res) => {
-        this.badgeNumber = res;
-      });
-    },
-    getLabelHeight() {
-      const dom = uni.createSelectorQuery("#tabber");
-      console.log(dom);
-    },
-    checkAll() {
-      this.$emit("allSelect");
-    },
+	export default {
+		name: "kj-tabbar",
+		props: {
+			value1: {
+				type: Number,
+				default: 0,
+			},
+			goodsWeight: {
+				type: Number,
+				default: 0,
+			},
+			goodsPrice: {
+				type: String,
+				default: "",
+			},
+			//购物车所有商品
+			goodsList: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+			//购物车选中的商品
+			checkboxValue1: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+			success: {
+				type: Boolean,
+				default: true,
+			},
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		data() {
+			return {
+				all: [],
+				language: "zh-CN",
+				selegoods: [],
+				stringcheck: [],
+				skuitemid: [],
+				volume: "",
+				cartid: [],
+				ten_yuan_image: "",
+				badgeNumber: 0, //购物车商品数量
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+			list() {
+				var list = [
+					// {
+					// 	iconPath: "../../static/express1.png",
+					// 	selectedIconPath: "../../static/express2.png",
+					// 	text: "跨境速递",
+					// 	pagePath: "pages/express/express",
+					// },
+					{
+						iconPath: "../../static/index1.png",
+						selectedIconPath: "../../static/index2.png",
+						text: "商城",
+						pagePath: "pages/index/index",
+					},
+					{
+						iconPath: "../../static/shop.png",
+						selectedIconPath: "../../static/shop.png",
+						text: "购",
+						pagePath: "pages/shopping/shopping",
+					},
+					{
+						iconPath: "../../static/cart1.png",
+						selectedIconPath: "../../static/cart2.png",
+						text: "购物车",
+						pagePath: "pages/cart/cart",
+					},
+					{
+						iconPath: "../../static/mine1.png",
+						selectedIconPath: "../../static/mine2.png",
+						text: "我的",
+						pagePath: "pages/mine/mine",
+					},
+				];
+				list[1].iconPath = this.ten_yuan_image;
+				list[1].selectedIconPath = this.ten_yuan_image;
+				list[0].text = this.i18n.shop;
+				list[1].text = this.i18n.chase;
+				list[2].text = this.i18n.Shopping;
+				list[3].text = this.i18n.mine;
+				return list;
+			},
+		},
+		created() {
+			this.all = [];
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
+			this.getimage();
+			this.getNumber();
+		},
+		methods: {
+			getimage() {
+				uni.$u.http
+					.get("/api/config", {
+						params: {
+							module: "basic",
+						},
+					})
+					.then((res) => {
+						this.ten_yuan_image = res.ten_yuan_image;
+					})
+					.catch(() => {});
+			},
+			account() {
+				if (this.checkboxValue1.length == 0) {
+					this.$u.toast("请选择商品");
+				} else {
+					this.selegoods = [];
+					this.skuitemid = [];
+					this.cartid = [];
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							console.log("items", items);
+							if (this.checkboxValue1.indexOf(items.cart.id) > -1) {
+								this.selegoods = this.selegoods.concat(items);
+								this.stringcheck = this.stringcheck.concat(items.cart.id);
+								this.skuitemid = this.skuitemid.concat(items.cart.sku_item_id);
+								// if (items.is_shipping == 1 && item.goods.length>1) {
+								this.cartid = this.cartid.concat(items.cart.id);
+							}
+						});
+					});
+					uni.$u.http
+						.get(
+							`/api/order_goods_volume?sku_item_id=` + this.skuitemid.toString(), {}
+						)
+						.then((res) => {
+							console.log("weight", res);
+							this.volume = res;
+						});
+					this.$nextTick(() => {
+						uni.navigateTo({
+							url: "/pageA/order?selelist=" +
+								encodeURIComponent(JSON.stringify(this.selegoods)) +
+								"&typea=" +
+								"shop" +
+								"&goodsPrice=" +
+								this.goodsPrice +
+								"&goodsWeight=" +
+								this.goodsWeight +
+								"&stringcheck=" +
+								this.stringcheck.toString() +
+								"&volume=" +
+								this.volume +
+								"&cartid=" +
+								this.cartid.join(","),
+						});
+					});
+				}
+			},
+			//获取购物车数量
+			getNumber() {
+				if (uni.getStorageSync('token')) {
+					uni.$u.http.get(`/api/cart/number`).then((res) => {
+						this.badgeNumber = res;
+					});
+				}
+			},
+			getLabelHeight() {
+				const dom = uni.createSelectorQuery("#tabber");
+				console.log(dom);
+			},
+			checkAll() {
+				this.$emit("allSelect");
+			},
 
-    //
-    cancelAll(value) {
-      if (value == "全选") {
-        return this.all;
-      } else if (value == "取消") {
-        this.all = [];
-      } else {
-        this.all.push(this.i18n.selectall);
-      }
-    },
+			//
+			cancelAll(value) {
+				if (value == "全选") {
+					return this.all;
+				} else if (value == "取消") {
+					this.all = [];
+				} else {
+					this.all.push(this.i18n.selectall);
+				}
+			},
 
-    click1(e) {
-      console.log(e);
-      if (e == 3) {
-        uni.switchTab({
-          url: "../../pages/mine/mine",
-        });
-      }
+			click1(e) {
+				console.log(e);
+				if (e == 3) {
+					uni.switchTab({
+						url: "../../pages/mine/mine",
+					});
+				}
 
-      if (e == 0) {
-        uni.switchTab({
-          url: "../../pages/index/index",
-        });
-      }
+				if (e == 0) {
+					uni.switchTab({
+						url: "../../pages/index/index",
+					});
+				}
 
-      if (e == 1) {
-        uni.switchTab({
-          url: "../../pages/shopping/shopping",
-        });
-      }
+				if (e == 1) {
+					uni.switchTab({
+						url: "../../pages/shopping/shopping",
+					});
+				}
 
-      if (e == 2) {
-        uni.switchTab({
-          url: "../../pages/cart/cart",
-        });
-      }
-    },
-  },
-  // watch: {
-  // 	config: {
-  // 		handler(val) {
-  // 			if (val.report_switch == 1) {
-  // 				this.list = [{
-  // 						"iconPath": "/static/images/index.png",
-  // 						"pagePath": "/pages/index/index",
-  // 						"selectedIconPath": "/static/images/index1.png",
-  // 						"text": "首页"
-  // 					},
-  // 					{
-  // 						"iconPath": "/static/images/video.png",
-  // 						"pagePath": "/pages/video/video",
-  // 						"selectedIconPath": "/static/images/video1.png",
-  // 						"text": "视频"
-  // 					},
-  // 					{
-  // 						"iconPath": "/static/images/baobei.png",
-  // 						"pagePath": "/pages/baobei/baobei",
-  // 						"selectedIconPath": "/static/images/baobei1.png",
-  // 						"text": "客户报备"
-  // 					},
-  // 					{
-  // 						"iconPath": "/static/images/mine.png",
-  // 						"pagePath": "/pages/mine/mine",
-  // 						"selectedIconPath": "/static/images/mine1.png",
-  // 						"text": "我的"
-  // 					}
-  // 				]
-  // 			}
-  // 		},
-  // 		deep: true
-  // 	}
-  // }
-};
+				if (e == 2) {
+					uni.switchTab({
+						url: "../../pages/cart/cart",
+					});
+				}
+			},
+		},
+		// watch: {
+		// 	config: {
+		// 		handler(val) {
+		// 			if (val.report_switch == 1) {
+		// 				this.list = [{
+		// 						"iconPath": "/static/images/index.png",
+		// 						"pagePath": "/pages/index/index",
+		// 						"selectedIconPath": "/static/images/index1.png",
+		// 						"text": "首页"
+		// 					},
+		// 					{
+		// 						"iconPath": "/static/images/video.png",
+		// 						"pagePath": "/pages/video/video",
+		// 						"selectedIconPath": "/static/images/video1.png",
+		// 						"text": "视频"
+		// 					},
+		// 					{
+		// 						"iconPath": "/static/images/baobei.png",
+		// 						"pagePath": "/pages/baobei/baobei",
+		// 						"selectedIconPath": "/static/images/baobei1.png",
+		// 						"text": "客户报备"
+		// 					},
+		// 					{
+		// 						"iconPath": "/static/images/mine.png",
+		// 						"pagePath": "/pages/mine/mine",
+		// 						"selectedIconPath": "/static/images/mine1.png",
+		// 						"text": "我的"
+		// 					}
+		// 				]
+		// 			}
+		// 		},
+		// 		deep: true
+		// 	}
+		// }
+	};
 </script>
 
 <style lang="scss" scoped>
-.all {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #444444;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.all {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #444444;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.bottom {
-  width: 750rpx;
-  height: 100rpx;
-  background: #ffffff;
-  padding: 0 24rpx;
-  box-sizing: border-box;
+	.bottom {
+		width: 750rpx;
+		height: 100rpx;
+		background: #ffffff;
+		padding: 0 24rpx;
+		box-sizing: border-box;
 
-  .dle {
-    width: 136rpx;
-    height: 60rpx;
-    text-align: center;
-    line-height: 60rpx;
-    border-radius: 38rpx;
-    border: 2rpx solid rgba(151, 151, 151, 1);
-    font-size: 26rpx;
-    color: rgba(51, 51, 51, 1);
-  }
+		.dle {
+			width: 136rpx;
+			height: 60rpx;
+			text-align: center;
+			line-height: 60rpx;
+			border-radius: 38rpx;
+			border: 2rpx solid rgba(151, 151, 151, 1);
+			font-size: 26rpx;
+			color: rgba(51, 51, 51, 1);
+		}
 
-  .allweight {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 22rpx;
-    color: #333333;
-    line-height: 32rpx;
-    text-align: left;
-    font-style: normal;
-  }
+		.allweight {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 22rpx;
+			color: #333333;
+			line-height: 32rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-  .sum {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 22rpx;
-    color: #333333;
-    line-height: 32rpx;
-    text-align: left;
-    font-style: normal;
-  }
+		.sum {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 22rpx;
+			color: #333333;
+			line-height: 32rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-  .summon {
-    font-family: JDZhengHT, JDZhengHT;
-    font-weight: 400;
-    font-size: 24rpx;
-    color: #ff1515;
-    line-height: 30rpx;
-    text-align: left;
-    font-style: normal;
-  }
+		.summon {
+			font-family: JDZhengHT, JDZhengHT;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #ff1515;
+			line-height: 30rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-  .settle {
-    width: 176rpx;
-    height: 68rpx;
-    background: #f83224;
-    border-radius: 38rpx;
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 500;
-    font-size: 28rpx;
-    color: #ffffff;
-    line-height: 68rpx;
-    text-align: center;
-    font-style: normal;
-    margin-left: 20rpx;
-  }
-}
-</style>
+		.settle {
+			width: 176rpx;
+			height: 68rpx;
+			background: #f83224;
+			border-radius: 38rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #ffffff;
+			line-height: 68rpx;
+			text-align: center;
+			font-style: normal;
+			margin-left: 20rpx;
+		}
+	}
+</style>

pageA/chat/chat.vue

@@ -15,7 +15,8 @@
 		</u-navbar>
 
 		<view class="" style="height: 60rpx;"></view>
-		<scroll-view scroll-y="true" :scroll-into-view="scrollIntoViewId" style="height: calc(100vh - 360rpx);overflow: hidden;">
+		<scroll-view scroll-y="true" :scroll-into-view="scrollIntoViewId"
+			style="height: calc(100vh - 180rpx);overflow: hidden;">
 			<view :id="'msg'+ item.ext.id" class="chat-item" v-for="(item,index) in list" :key="index">
 				<view class="chat-time">
 					{{renderTime(item.time)}}
@@ -122,12 +123,11 @@
 					<image v-else-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 				</view>
 			</view>
-
+			<view class="" style="height: 55rpx;"></view>
+			<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
+				@success="getdatab()"></kj-chat>
 		</scroll-view>
-		<view class="" style="height: 55rpx;"></view>
-		<!-- <kj-chat></kj-chat> -->
-		<kj-chat style="position: fixed;bottom: 0;left: 0;z-index: 100;" :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
-			@success="getdatab()"></kj-chat>
+
 	</view>
 </template>
 

pageA/counter.vue

@@ -3,7 +3,8 @@
 	<view class="back">
 		<!-- 城市 -->
 		<view class="add u-flex u-row-around">
-			<text class='address' @click="change(0)">{{original||i18n.Starting}}</text>
+			<!-- <text class='address' @click="change(0)">{{original||i18n.Starting}}</text> -->
+			<text class='address'>{{i18n.inland}}</text>
 			<image src="static/images/arrows.png" mode="" style="width: 130rpx;height: 10rpx;"></image>
 			<text class='address' @click="change(1)">{{bourn||i18n.destination}}</text>
 		</view>
@@ -16,11 +17,11 @@
 			<view class="u-flex" style="margin-top: 24rpx;">
 				<view :class="index==idx?'left':'right'" @click="good(item,idx)" style="margin-right: 20rpx;"
 					v-for="(item,idx) in goods" :key="idx">
-						{{item.value=='normal'? i18n.Normal :i18n.special}}
-					</view>
+					{{item.value=='normal'? i18n.Normal :i18n.special}}
+				</view>
 				<!-- <view class="right" style="margin-left: 20rpx;">特殊商品</view> -->
 			</view>
-		</view> 
+		</view>
 		<!-- 跨境物流 -->
 		<view class="logistics u-flex u-row-between">
 			<text style="font-weight: 600;">{{i18n.flow}}</text>
@@ -91,13 +92,15 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 			</view>
 		</view>
 		<!-- 地址选择 -->
-		<u-picker :show="show" ref="uPicker" keyName="name" :columns="columns" @confirm="confirm"
+<!-- 		<u-picker :show="show" ref="uPicker" keyName="name" :columns="columns" @confirm="confirm"
+			@change="changeHandler"></u-picker> -->
+		<u-picker :show="show" ref="uPicker" keyName="name" :columns="columns"  @confirm="confirm"
 			@change="changeHandler"></u-picker>
 		<!-- 跨境物流 -->
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
 				<kj-flow :goodstype='goodstype' :province_id='province_id' ref="child" @success='success'
-					@close='logshow=false'></kj-flow>
+					@close='logshow=false' :country_id='country_id'></kj-flow>
 			</view>
 		</u-popup>
 	</view>
@@ -125,6 +128,7 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 				index: 0,
 				domestic: 1,
 				province_id: '',
+				country_id: '',
 				goodstype: 'normal',
 				container_id: '', //货柜id
 				leftname: '',
@@ -167,7 +171,8 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 			},
 			//物流选择
 			changewu() {
-				if (this.province_id) {
+				// if (this.province_id) {
+				if (this.country_id) {
 					this.logshow = true
 					setTimeout(() => {
 						this.$refs.child.transport();
@@ -175,7 +180,7 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 				} else {
 					this.$u.toast(this.i18n.selectcity)
 				}
-			},
+			},  
 			//物流计算器
 			calculate() {
 				if (this.container_id == '') {
@@ -198,26 +203,51 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 				})
 			},
 			//地区列表
+			// getarea() {
+			// 	this.columns = []
+			// 	this.columnData = []
+			// 	uni.$u.http.get('/api/area/tree', {
+			// 		params: {
+			// 			is_domestic: this.domestic,
+			// 			pid: 0
+			// 		}
+			// 	}).then((res) => {
+			// 		console.log(res)
+			// 		// this.columns.splice(0,1, [{name:res[0].name}]) 
+			// 		this.columns = [res]
+			// 		this.columns[1] = res[0].children
+			// 		// this.columnData[0] = res[0].children
+			// 		res.forEach(item => {
+			// 			this.columnData.push(item.children)
+			// 		})
+			// 	}).catch(() => {
+
+			// 	})
+			// },
 			getarea() {
 				this.columns = []
 				this.columnData = []
-				uni.$u.http.get('/api/area/tree', {
-					params: {
-						is_domestic: this.domestic,
-						pid: 0
-					}
-				}).then((res) => {
-					console.log(res)
-					// this.columns.splice(0,1, [{name:res[0].name}]) 
-					this.columns = [res]
-					this.columns[1] = res[0].children
-					// this.columnData[0] = res[0].children
-					res.forEach(item => {
-						this.columnData.push(item.children)
-					})
-				}).catch(() => {
+				uni.$u.http.get(`/api/container/country`).then((res) => {
+					this.columns.push(res)
+				});
+				console.log(this.columns);
+				// uni.$u.http.get('/api/area/tree', {
+				// 	params: {
+				// 		is_domestic: this.domestic,
+				// 		pid: 0
+				// 	}
+				// }).then((res) => {
+				// 	console.log(res)
+				// 	// this.columns.splice(0,1, [{name:res[0].name}]) 
+				// 	this.columns = [res]
+				// 	this.columns[1] = res[0].children
+				// 	// this.columnData[0] = res[0].children
+				// 	res.forEach(item => {
+				// 		this.columnData.push(item.children)
+				// 	})
+				// }).catch(() => {
 
-				})
+				// })
 			},
 			success(msg) {
 				this.logshow = false
@@ -262,31 +292,60 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 					this.getarea()
 				}
 			},
+			// changeHandler(e) {
+			// 	const {
+			// 		columnIndex,
+			// 		value,
+			// 		values, // values为当前变化列的数组内容
+			// 		index,
+			// 		// 微信小程序无法将picker实例传出来，只能通过ref操作
+			// 		picker = this.$refs.uPicker
+			// 	} = e
+			// 	// 当第一列值发生变化时，变化第二列(后一列)对应的选项
+			// 	if (columnIndex === 0) {
+			// 		// picker为选择器this实例，变化第二列对应的选项
+			// 		picker.setColumnValues(1, this.columnData[index])
+			// 	}
+			// },
 			changeHandler(e) {
-				const {
-					columnIndex,
-					value,
-					values, // values为当前变化列的数组内容
-					index,
-					// 微信小程序无法将picker实例传出来，只能通过ref操作
-					picker = this.$refs.uPicker
-				} = e
-				// 当第一列值发生变化时，变化第二列(后一列)对应的选项
-				if (columnIndex === 0) {
-					// picker为选择器this实例，变化第二列对应的选项
-					picker.setColumnValues(1, this.columnData[index])
-				}
+				console.log(e);
+				// const {
+				// 	columnIndex,
+				// 	value,
+				// 	values, // values为当前变化列的数组内容
+				// 	index,
+				// 	// 微信小程序无法将picker实例传出来，只能通过ref操作
+				// 	picker = this.$refs.uPicker
+				// } = e
+				// // 当第一列值发生变化时，变化第二列(后一列)对应的选项
+				// if (columnIndex === 0) {
+				// 	// picker为选择器this实例，变化第二列对应的选项
+				// 	picker.setColumnValues(1, this.columnData[index])
+				// }
 			},
 			// 回调参数为包含columnIndex、value、values
+			// confirm(e) {
+			// 	console.log('confirm', e)
+			// 	this.show = false
+			// 	if (this.type == 0) {
+			// 		this.original = e.value[0].name + '-' + e.value[1].name
+			// 		// console.log(e.value[0]);
+			// 	} else {
+			// 		this.bourn = e.value[0].name + '-' + e.value[1].name
+			// 		this.province_id = e.value[1].id
+			// 		this.country_id = e.value[0].id
+			// 	}
+			// }
 			confirm(e) {
 				console.log('confirm', e)
 				this.show = false
 				if (this.type == 0) {
-					this.original = e.value[0].name + '-' + e.value[1].name
+					this.original = e.value[0].name 
 					// console.log(e.value[0]);
 				} else {
-					this.bourn = e.value[0].name + '-' + e.value[1].name
-					this.province_id = e.value[1].id
+					this.bourn = e.value[0].name 
+					// this.province_id = e.value[1].id
+					this.country_id = e.value[0].id
 				}
 			}
 		}

pageA/order.vue

@@ -203,13 +203,13 @@
 				<!-- <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view> -->
 				<view class="money">{{ weight_total }}</view>
 			</view>
-			<view class="back u-flex" v-if="containname1">
+<!-- 			<view class="back u-flex" v-if="containname1">
 				<image src="static/images/warning.png" style="width: 32rpx; height: 32rpx" mode=""></image>
 				<text
 					style="margin-left: 12rpx; font-size: 24rpx">{{ i18n.buy }}{{ recommend_weight }}kg{{ i18n.price }}¥{{
             unit_fee
           }}，{{ i18n.morefavorable }}</text>
-			</view>
+			</view> -->
 			<view class="u-flex u-row-between" style="margin-bottom: 40rpx; margin-top: 20rpx">
 				<view class="name">{{ i18n.Costperkilogram }}</view>
 				<view class="money">{{
@@ -376,6 +376,7 @@
 				language: "zh-CN",
 				containerList: [], //列表
 				province_id: "",
+				country_id:'',
 				transport_type_id: "",
 				containlist: [],
 				containid: "", //货柜id
@@ -481,6 +482,7 @@
 					.get("/api/transport-type", {
 						params: {
 							province_id: this.province_id,
+							country_id:this.country_id
 						},
 					})
 					.then((res) => {
@@ -510,6 +512,7 @@
 						getadd(res) {
 							that.addinfo = res;
 							that.province_id = res.province_id;
+							that.country_id = res.country_id
 							that.transport();
 						},
 					},
@@ -547,6 +550,7 @@
 						params: {
 							is_page: 0,
 							province_id: this.province_id,
+							country_id:this.country_id,
 							transport_type_id: this.transport_type_id,
 							weight: this.typea == "shop" ?
 								"" : Number(this.sku_info.weight) * this.value,

pageA/service/service.vue

@@ -4,13 +4,13 @@
 		<u-navbar :title="i18n.customerService" :safeAreaInsetTop="true" :placeholder='true' :fixed='true'>
 			<view class="u-nav-slot u-flex" slot="left">
 				<u-icon @click="return1" name="arrow-left" size="19"></u-icon>
-				<image src="../static/images/phone.png" style="width: 40rpx;height: 40rpx;margin-left: 44rpx;" mode="">
+				<image @click="callphone" src="../static/images/phone.png" style="width: 40rpx;height: 40rpx;margin-left: 44rpx;" mode="">
 				</image>
 			</view>
 		</u-navbar>
 
 		<view class="" style="height: 60rpx;"></view>
-		<scroll-view scroll-y="true" :scroll-into-view="scrollIntoViewId" style="height: calc(100vh - 360rpx);overflow: hidden;">
+		<scroll-view scroll-y="true" :scroll-into-view="scrollIntoViewId" style="height: calc(100vh - 180rpx);overflow: hidden;">
 			<view :id="'msg'+ item.ext.id" class="chat-item" v-for="(item,index) in list" :key="index">
 				<view class="chat-time">
 					{{renderTime(item.time)}}
@@ -105,10 +105,13 @@
 				</view>
 			</view>
 			<!-- <kj-chat></kj-chat> -->
+			<view class="" style="height: 55rpx;"></view>
+			<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
+				@success="getdatab()"></kj-chat>
 		</scroll-view>
-		<view class="" style="height: 55rpx;"></view>
+<!-- 		<view class="" style="height: 55rpx;"></view>
 		<kj-chat style="position: fixed;bottom: 0;left: 0;z-index: 100;" :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
-			@success="getdatab()"></kj-chat>
+			@success="getdatab()"></kj-chat> -->
 	</view>
 </template>
 
@@ -647,4 +650,4 @@
 	page {
 		background-color: #F3F3F3;
 	}
-</style>
+</style> 

pageB/citychange.vue

@@ -21,20 +21,30 @@
 		},
 		methods: {
 			//根据国家获取城市
-			getCountryList() {
+			getCountryList() {  
 				uni.$u.http.get(`/api/area?is_domestic=0&pid=`).then((res) => {
 					this.dataList = res;
 				});
 			},
+			// getCountryList() {
+			// 	uni.$u.http.get(`/api/container/country`).then((res) => {
+			// 		this.dataList = res;
+			// 	});
+			// },
 			//点击列表回调事件
 			click(e) {
-				const eventchannel = this.getOpenerEventChannel();
+				var that = this
+				console.log(e);
+				const eventchannel = that.getOpenerEventChannel();
+				
+				console.log(eventchannel);
+				
 				eventchannel.emit('getadd', e)
-				if(this.searchlist.includes(e)){
+				if(that.searchlist.includes(e)){
 					
 				}else{
-					this.searchlist.unshift(e)
-					uni.setStorageSync('searchlist',this.searchlist.slice(0,6))
+					that.searchlist.unshift(e)
+					uni.setStorageSync('searchlist',that.searchlist.slice(0,6))
 				}
 				uni.navigateBack()
 			}

pageB/delivery.vue

@@ -137,11 +137,11 @@
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
 				<kj-flow ref="child" :goodstype="goodinfo.goodtype" :province_id='bottomadd.province_id'
-					@success='success' @close='logshow=false'></kj-flow>
+					@success='success' @close='logshow=false' :country_id='bottomadd.province_id'></kj-flow>
 			</view>
 		</u-popup>
 		<u-popup :show="internationalshow" :round="20" @close="close()" :closeable='true'>
-			<view style="
+			<view style="  
 		  padding: 48rpx 24rpx;
 		  box-sizing: border-box;
 		  position: relative;

pageB/goods.vue

@@ -31,7 +31,7 @@
 		<view class="type  u-flex u-row-between">
 			<view class="u-flex">
 				<text class="title">{{i18n.shoptype}}</text>
-				<image src="../static/express/explain.png" style="width: 32rpx;height: 32rpx;margin-left: 10rpx;"
+				<image @click="toxieyi('product_type_description')" src="../static/express/explain.png" style="width: 32rpx;height: 32rpx;margin-left: 10rpx;"
 					mode=""></image>
 			</view>
 			<view class="u-flex">
@@ -116,7 +116,7 @@
 			<view class="u-flex" style="margin-top: 28rpx;">
 				<view class="zhu">
 					{{i18n.Note}}
-					<text class="rule"> {{i18n.rule}}</text>
+					<text class="rule" @click="toxieyi('regole_di_fatturazione')"> {{i18n.rule}}</text>
 				</view>
 			</view>
 		</view>
@@ -177,6 +177,11 @@
 			})
 		},
 		methods: {
+			toxieyi(code){
+				uni.navigateTo({
+					url:'/pageB/xieyi?code='+ code
+				})
+			},
 			enter() {
 				if (this.goodid == '') {
 					this.$u.toast(this.i18n.itemtoSend)

pageB/recipientinfo.vue

@@ -20,7 +20,9 @@
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.phone}}</text>
-				<view class="right">
+				<view class="right" style="display: flex;">
+				<!-- 	<input style="width: 100rpx;" type="text" placeholder="(+86)" v-model="phone" />
+					<text style="margin-right: 20rpx;">-</text> -->
 					<input type="text" :placeholder="i18n.pleasePhoneNumber" v-model="phone" />
 				</view>
 			</view>

pageC/accountSetup/accountSetup.vue

@@ -1,92 +1,50 @@
 <template>
-  <view class="page">
-    <view class="set-top">
-      <view
-        class="information"
-        @click="toNextPage('/pageC/personalInformation/personalInformation')"
-      >
-        <view class="information-lift">
-          <image :src="userInfo.avatar" class="header-img" mode=""></image>
-          <view class="name"> {{ userInfo.nickname }} </view>
-        </view>
-        <image
-          class="right-icon"
-          src="../../static/mine/325.png"
-          mode=""
-        ></image>
-      </view>
-      <view
-        class="address"
-        @click="
+	<view class="page">
+		<view class="set-top">
+			<view class="information" @click="toNextPage('/pageC/personalInformation/personalInformation')">
+				<view class="information-lift">
+					<image :src="userInfo.avatar" class="header-img" mode=""></image>
+					<view class="name"> {{ userInfo.nickname }} </view>
+				</view>
+				<image class="right-icon" src="../../static/mine/325.png" mode=""></image>
+			</view>
+			<view class="address" @click="
           toNextPage('/pageC/addressManagement/addressManagement?type=setup')
-        "
-      >
-        <view class="address-manage">
-          {{ i18n.address }}
-        </view>
-        <view class="text-right">
-          <text>{{ i18n.addAndEdit }}</text>
-          <image
-            src="../../static/mine/325.png"
-            class="right-icon"
-            mode=""
-          ></image>
-        </view>
-      </view>
-    </view>
-
-    <view class="set-center">
-      <view
-        class="security"
-        @click="toNextPage('/pageC/accountSecurity/accountSecurity')"
-      >
-        <text>{{ i18n.accountCancellation }}</text>
-        <view class="text-right">
-          <!-- <text>{{ i18n.password }}</text> -->
-          <image
-            src="../../static/mine/325.png"
-            class="right-icon"
-            mode=""
-          ></image>
-        </view>
-      </view>
-      <view
-        class="switch"
-        @click="toNextPage('/pageC/switchLanguage/switchLanguage')"
-      >
-        <text>{{ i18n.switch }}</text>
-        <image
-          src="../../static/mine/325.png"
-          class="right-icon"
-          mode=""
-        ></image>
-      </view>
-    </view>
-
-    <view class="set-bottom">
-      <view
-        class="text-1"
-        @click="toNextPage(`/pageD/userAgreement/userAgreement`)"
-      >
-        <text>{{ i18n.user }}</text>
-        <image
-          src="../../static/mine/325.png"
-          class="right-icon"
-          mode=""
-        ></image>
-      </view>
-      <view
-        class="text-1"
-        @click="toNextPage('/pageC/privacyPolicy/privacyPolicy')"
-      >
-        <text>{{ i18n.privacy }}</text>
-        <image
-          src="../../static/mine/325.png"
-          class="right-icon"
-          mode=""
-        ></image>
-      </view>
-      <!-- <view
+        ">
+				<view class="address-manage">
+					{{ i18n.address }}
+				</view>
+				<view class="text-right">
+					<text>{{ i18n.addAndEdit }}</text>
+					<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
+				</view>
+			</view>
+		</view>
+
+		<view class="set-center">
+			<view class="security" @click="toNextPage('/pageC/accountSecurity/accountSecurity')">
+				<text>{{ i18n.accountCancellation }}</text>
+				<view class="text-right">
+					<!-- <text>{{ i18n.password }}</text> -->
+					<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
+				</view>
+			</view>
+			<view class="switch" @click="toNextPage('/pageC/switchLanguage/switchLanguage')">
+				<text>{{ i18n.switch }}</text>
+				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
+			</view>
+		</view>
+
+		<view class="set-bottom">
+			<view class="text-1" @click="toNextPage(`/pageD/userAgreement/userAgreement`)">
+				<text>{{ i18n.user }}</text>
+				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
+			</view>
+			<view class="text-1" @click="toNextPage('/pageC/privacyPolicy/privacyPolicy')">
+				<text>{{ i18n.privacy }}</text>
+				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
+			</view>
+			<!-- <view
         class="text-1"
         @click="toNextPage(`/pageD/platformProducts/platformProducts`)"
       >
@@ -97,186 +55,183 @@
           mode=""
         ></image>
       </view> -->
-      <view
-        class="text-2"
-        @click="toNextPage(`/pageD/joinPlatfrom/joinPlatfrom`)"
-      >
-        <text>{{ i18n.merchant }}</text>
-        <image
-          src="../../static/mine/325.png"
-          class="right-icon"
-          mode=""
-        ></image>
-      </view>
-    </view>
-
-    <button class="layout" @click="layout">{{ i18n.layout }}</button>
-  </view>
+			<view class="text-2" @click="toNextPage(`/pageD/joinPlatfrom/joinPlatfrom`)">
+				<text>{{ i18n.merchant }}</text>
+				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
+			</view>
+		</view>
+
+		<button class="layout" @click="layout">{{ i18n.layout }}</button>
+	</view>
 </template>
 
 <script>
-import { conn } from "../../utils/WebIM.js";
-import AllRight from "../mineComponent/allRight/allRight.vue";
-export default {
-  components: {
-    AllRight,
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  onShow() {
-    this.getUserInfo();
-    uni.setNavigationBarTitle({
-      title: this.i18n.setup,
-    });
-  },
-  data() {
-    return {
-      userInfo: {},
-    };
-  },
-  methods: {
-    //退出登录
-    layout() {
-      uni.clearStorage();
-      uni.navigateTo({
-        url: "/pages/login/login",
-      });
-      conn.close();
-    },
-    toNextPage(url) {
-      uni.navigateTo({
-        url: url,
-      });
-    },
-    getUserInfo() {
-      uni.getStorage({
-        key: "user_info",
-        success: ({ data }) => {
-          this.userInfo = data;
-        },
-      });
-    },
-  },
-  mounted() {
-    uni.setNavigationBarTitle({
-      title: this.i18n.setup,
-    });
-  },
-  created() {},
-};
+	import {
+		conn
+	} from "../../utils/WebIM.js";
+	import AllRight from "../mineComponent/allRight/allRight.vue";
+	export default {
+		components: {
+			AllRight,
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		onShow() {
+			this.getUserInfo();
+			uni.setNavigationBarTitle({
+				title: this.i18n.setup,
+			});
+		},
+		data() {
+			return {
+				userInfo: {},
+			};
+		},
+		methods: {
+			//退出登录
+			layout() {
+				uni.clearStorage();
+				uni.reLaunch({
+					url: "/pages/login/login",
+				});
+				conn.close();
+			},
+			toNextPage(url) {
+				uni.navigateTo({
+					url: url,
+				});
+			},
+			getUserInfo() {
+				uni.getStorage({
+					key: "user_info",
+					success: ({
+						data
+					}) => {
+						this.userInfo = data;
+					},
+				});
+			},
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.setup,
+			});
+		},
+		created() {},
+	};
 </script>
 
 <style lang="scss" scoped>
-.page {
-  padding: 20rpx 24rpx;
-
-  .set-top {
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 0 20rpx;
-
-    .information {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      width: 100%;
-      height: 176rpx;
-
-      .information-lift {
-        display: flex;
-        align-items: center;
-
-        .header-img {
-          border-radius: 50%;
-          height: 116rpx;
-          width: 116rpx;
-          margin-right: 20rpx;
-        }
-
-        .name {
-          font-size: 36rpx;
-        }
-      }
-    }
-
-    .address {
-      display: flex;
-      justify-content: space-between;
-      height: 106rpx;
-      align-items: center;
-      border-top: 2rpx solid rgba(151, 151, 151, 0.2);
-    }
-  }
-
-  .set-center {
-    margin-top: 20rpx;
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 0 20rpx;
-
-    .security {
-      display: flex;
-      height: 102rpx;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
-      justify-content: space-between;
-      align-items: center;
-    }
-
-    .switch {
-      display: flex;
-      justify-content: space-between;
-      height: 104rpx;
-      align-items: center;
-    }
-  }
-
-  .set-bottom {
-    border-radius: 16rpx;
-    padding: 0 20rpx;
-    background-color: #fff;
-    margin-top: 20rpx;
-
-    .text-1 {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      height: 102rpx;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
-    }
-
-    .text-2 {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      height: 102rpx;
-    }
-  }
-
-  .layout {
-    border-radius: 16rpx;
-    background-color: #fff;
-    color: #f83224;
-    font-size: 32rpx;
-    height: 92rpx;
-    margin-top: 20rpx;
-  }
-
-  .right-icon {
-    width: 32rpx;
-    height: 32rpx;
-  }
-
-  .text-right {
-    display: flex;
-    align-items: center;
-
-    text {
-      font-size: 30rpx;
-      color: rgba(34, 34, 34, 0.5);
-    }
-  }
-}
-</style>
+	.page {
+		padding: 20rpx 24rpx;
+
+		.set-top {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 20rpx;
+
+			.information {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				width: 100%;
+				height: 176rpx;
+
+				.information-lift {
+					display: flex;
+					align-items: center;
+
+					.header-img {
+						border-radius: 50%;
+						height: 116rpx;
+						width: 116rpx;
+						margin-right: 20rpx;
+					}
+
+					.name {
+						font-size: 36rpx;
+					}
+				}
+			}
+
+			.address {
+				display: flex;
+				justify-content: space-between;
+				height: 106rpx;
+				align-items: center;
+				border-top: 2rpx solid rgba(151, 151, 151, 0.2);
+			}
+		}
+
+		.set-center {
+			margin-top: 20rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 20rpx;
+
+			.security {
+				display: flex;
+				height: 102rpx;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
+				justify-content: space-between;
+				align-items: center;
+			}
+
+			.switch {
+				display: flex;
+				justify-content: space-between;
+				height: 104rpx;
+				align-items: center;
+			}
+		}
+
+		.set-bottom {
+			border-radius: 16rpx;
+			padding: 0 20rpx;
+			background-color: #fff;
+			margin-top: 20rpx;
+
+			.text-1 {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 102rpx;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
+			}
+
+			.text-2 {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 102rpx;
+			}
+		}
+
+		.layout {
+			border-radius: 16rpx;
+			background-color: #fff;
+			color: #f83224;
+			font-size: 32rpx;
+			height: 92rpx;
+			margin-top: 20rpx;
+		}
+
+		.right-icon {
+			width: 32rpx;
+			height: 32rpx;
+		}
+
+		.text-right {
+			display: flex;
+			align-items: center;
+
+			text {
+				font-size: 30rpx;
+				color: rgba(34, 34, 34, 0.5);
+			}
+		}
+	}
+</style>

pageC/internationalAddress/internationalAddress.vue

@@ -313,12 +313,17 @@ export default {
       this.show = false;
       this.showDialog = false;
     },
-    //获取所有国家
+    // 获取所有国家
     getCountryList() {
       uni.$u.http.get(`/api/area?is_domestic=0&pid=`).then((res) => {
         this.columns = [res];
       });
     },
+    // getCountryList() {
+    //   uni.$u.http.get(`/api/container/country`).then((res) => {
+    //     this.columns = [res];
+    //   });
+    // },
     //根据国家获取城市
     getCityList(num) {
       uni.$u.http.get(`/api/area/tree?pid=${num}`).then((res) => {

pageC/refundDetail/component/refundInformation.vue

@@ -1,304 +1,287 @@
 <template>
-  <view class="detail">
-    <view class="title">
-      <view class="title-left">
-        <image
-          class="header-img"
-          :src="goodsDetail.merchant.image"
-          mode=""
-        ></image>
-        <text>{{ goodsDetail.merchant.merchant_name }}</text>
-        <image
-          class="right-325"
-          src="../../../static/mine/325.png"
-          mode=""
-        ></image>
-      </view>
-      <view class="title-right" @click="tochat">
-        <u-icon name="chat" color="#f83224" size="28"></u-icon>
-        <text>{{
+	<view class="detail">
+		<view class="title">
+			<view class="title-left">
+				<image class="header-img" :src="goodsDetail.merchant.image" mode=""></image>
+				<text>{{ goodsDetail.merchant.merchant_name }}</text>
+				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+			</view>
+			<view class="title-right" @click="tochat">
+				<u-icon name="chat" color="#f83224" size="28"></u-icon>
+				<text>{{
           goodsDetail.merchant.id == 1
             ? i18n.contatto + i18n.plataforma
             : i18n.contatto + i18n.regimentalCommander
         }}</text>
-      </view>
-    </view>
-    <view class="commodity-information">
-      <view class="commodity-1">
-        <image
-          class="commodity-img"
-          :src="goodsDetail.goods_image"
-          mode=""
-        ></image>
-        <view class="">
-          <view class="commodity-2">
-            <view class="commodity-title" v-if="language == 'zh-CN'"
-              >{{ goodsDetail.goods.name_cn }}
-            </view>
-            <view class="commodity-title" v-if="language == 'en-US'"
-              >{{ goodsDetail.goods.name_en }}
-            </view>
-            <view class="commodity-title" v-if="language == 'es-ES'"
-              >{{ goodsDetail.goods.name_es }}
-            </view>
-            <view class="commodity-title" v-if="language == 'it-IT'"
-              >{{ goodsDetail.goods.name_ita }}
-            </view>
-          </view>
+			</view>
+		</view>
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img" :src="goodsDetail.goods_image" mode=""></image>
+				<view class="">
+					<view class="commodity-2">
+						<view class="commodity-title" v-if="language == 'zh-CN'">{{ goodsDetail.goods.name_cn }}
+						</view>
+						<view class="commodity-title" v-if="language == 'en-US'">{{ goodsDetail.goods.name_en }}
+						</view>
+						<view class="commodity-title" v-if="language == 'es-ES'">{{ goodsDetail.goods.name_es }}
+						</view>
+						<view class="commodity-title" v-if="language == 'it-IT'">{{ goodsDetail.goods.name_ita }}
+						</view>
+					</view>
 
-          <view class="commodity-3">
-            <view class="specifications">
-              {{ goodsDetail.sku_item.item }}
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="information">
-      <text class="_label">{{ i18n.OrderNumber }}</text>
-      <view style="color: #222">
-        <text style="color: rgba(34, 34, 34, 0.6)">{{
+					<view class="commodity-3">
+						<view class="specifications">
+							{{ goodsDetail.sku_item.item }}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">{{ i18n.OrderNumber }}</text>
+			<view style="color: #222">
+				<text style="color: rgba(34, 34, 34, 0.6)">{{
           goodsDetail.order_no
         }}</text>
-        <text @click="cope(goodsDetail.order_no)" style="color: #f83224">{{
+				<text @click="cope(goodsDetail.order_no)" style="color: #f83224">{{
           "&nbsp;" + "|" + "&nbsp;" + i18n.cope
         }}</text>
-      </view>
-    </view>
-    <view class="information">
-      <text class="_label">{{ i18n.ReasonRefund }}</text>
-      <view class="_title-right"> {{ goodsDetail.refund.refund_reason }} </view>
-    </view>
-    <view class="information">
-      <text class="_label">{{ i18n.refundAmount }}</text>
-      <view class="_title-right">
-        ¥{{
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">{{ i18n.ReasonRefund }}</text>
+			<view class="_title-right"> {{ goodsDetail.refund.refund_reason }} </view>
+		</view>
+		<view class="information">
+			<text class="_label">{{ i18n.refundAmount }}</text>
+			<view class="_title-right">
+				¥{{
           goodsDetail.refund.actual_refund_price ||
           goodsDetail.refund.refund_price
         }}
-      </view>
-    </view>
-    <view class="information">
-      <text class="_label">{{ i18n.NumberApplications }}</text>
-      <view class="_title-right">{{ goodsDetail.goods_num }} </view>
-    </view>
-    <view class="information">
-      <text class="_label">{{ i18n.applyForTime }}</text>
-      <view class="_title-right">{{ goodsDetail.refund.created_at }}</view>
-    </view>
-  </view>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">{{ i18n.NumberApplications }}</text>
+			<view class="_title-right">{{ goodsDetail.goods_num }} </view>
+		</view>
+		<view class="information">
+			<text class="_label">{{ i18n.applyForTime }}</text>
+			<view class="_title-right">{{ goodsDetail.refund.created_at }}</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import textRight from "../../accountSecurity/component/textRight.vue";
-export default {
-  components: {
-    textRight,
-  },
-  props: {
-    status: {
-      typeof: Number,
-      default: 0,
-    },
-    goodsDetail: {
-      typeof: Object,
-      default: () => {
-        return {};
-      },
-    },
-    language: {
-      typeof: String,
-      default: "",
-    },
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  data() {
-    return {
-      packageId: "",
-    };
-  },
-  onLoad(options) {},
-  methods: {
-    tochat() {
-      var that = this;
-      if (that.goodsDetail.merchant.id == 1) {
-        uni.navigateTo({
-          url: "/pageA/service/service",
-        });
-      } else {
-        uni.navigateTo({
-          url:
-            "/pageA/chat/chat?user_other=" +
-            encodeURIComponent(JSON.stringify(that.goodsDetail.merchant)) +
-            "&user_other_no=" +
-            that.goodsDetail.merchant.member.easemob_username,
-        });
-      }
-    },
-    application() {
-      uni.navigateTo({
-        url: "/pageC/applicationRefund/applicationRefund",
-      });
-    },
+	import textRight from "../../accountSecurity/component/textRight.vue";
+	export default {
+		components: {
+			textRight,
+		},
+		props: {
+			status: {
+				typeof: Number,
+				default: 0,
+			},
+			goodsDetail: {
+				typeof: Object,
+				default: () => {
+					return {};
+				},
+			},
+			language: {
+				typeof: String,
+				default: "",
+			},
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		data() {
+			return {
+				packageId: "",
+			};
+		},
+		onLoad(options) {},
+		methods: {
+			tochat() {
+				var that = this;
+				if (that.goodsDetail.merchant.id == 1) {
+					uni.navigateTo({
+						url: "/pageA/service/service",
+					});
+				} else {
+					uni.navigateTo({
+						url: "/pageA/chat/chat?user_other=" +
+							encodeURIComponent(JSON.stringify(that.goodsDetail.merchant)) +
+							"&user_other_no=" +
+							that.goodsDetail.merchant.member.easemob_username,
+					});
+				}
+			},
+			application() {
+				uni.navigateTo({
+					url: "/pageC/applicationRefund/applicationRefund",
+				});
+			},
 
-    //复制
-    cope(e) {
-      uni.setClipboardData({
-        data: e,
-        success() {
-          uni.showToast({
-            title: this.i18n.replicatingSuccess,
-            icon: "none",
-          });
-        },
-      });
-    },
-    getDetail() {},
-  },
-};
+			//复制
+			cope(e) {
+				uni.setClipboardData({
+					data: e,
+					success() {
+						uni.showToast({
+							title: this.i18n.replicatingSuccess,
+							icon: "none",
+						});
+					},
+				});
+			},
+			getDetail() {},
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-.detail {
-  padding: 28rpx 20rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  margin-top: 28rpx;
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
 
-  .title {
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-    padding-bottom: 20rpx;
+		.title {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+			padding-bottom: 20rpx;
 
-    .title-left {
-      display: flex;
-      font-size: 32rpx;
-      align-items: center;
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
 
-      .header-img {
-        width: 36rpx;
-        height: 36rpx;
-        border-radius: 50%;
-        margin-right: 20rpx;
-      }
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
 
-      .right-325 {
-        width: 32rpx;
-        height: 32rpx;
-      }
-    }
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
 
-    .title-right {
-      color: #333;
-      display: flex;
-      align-items: center;
-      font-size: 28rpx;
-    }
+			.title-right {
+				color: #333;
+				display: flex;
+				align-items: center;
+				font-size: 28rpx;
+			}
 
-    .order-status {
-      color: #f83224;
-      font-size: 26rpx;
-    }
-  }
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
 
-  .commodity-information {
-    margin-top: 28rpx;
+		.commodity-information {
+			margin-top: 28rpx;
 
-    .commodity-1 {
-      display: flex;
+			.commodity-1 {
+				display: flex;
 
-      .commodity-img {
-        width: 180rpx;
-        height: 180rpx;
-        margin-right: 20rpx;
-        border-radius: 10rpx;
-      }
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
 
-      .commodity-2 {
-        display: flex;
-        justify-content: space-between;
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
 
-        .commodity-title {
-          color: #222;
-          margin-right: 38rpx;
-          font-size: 28rpx;
-          width: 442rpx;
-          max-height: 80rpx;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-      }
+					.commodity-title {
+						color: #222;
+						margin-right: 38rpx;
+						font-size: 28rpx;
+						width: 442rpx;
+						max-height: 80rpx;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
 
-      .commodity-3 {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 20rpx;
-        color: #777;
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
 
-        .specifications {
-          font-size: 28rpx;
-          color: #777;
-        }
-      }
-    }
-  }
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+			}
+		}
 
-  .last {
-    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-    padding-bottom: 20rpx;
-  }
+		.last {
+			border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+			padding-bottom: 20rpx;
+		}
 
-  .btn-list {
-    display: flex;
-    justify-content: flex-end;
+		.btn-list {
+			display: flex;
+			justify-content: flex-end;
 
-    button {
-      width: 152rpx;
-      height: 58rpx;
-      border: 2rpx solid #979797;
-      color: #444;
-      margin: 0;
-      padding: 0;
-      font-size: 24rpx;
-      background-color: #fff;
-      border-radius: 34rpx;
-      margin-top: 20rpx;
-      margin-left: 20rpx;
-    }
-  }
+			button {
+				width: 152rpx;
+				height: 58rpx;
+				border: 2rpx solid #979797;
+				color: #444;
+				margin: 0;
+				padding: 0;
+				font-size: 24rpx;
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin-top: 20rpx;
+				margin-left: 20rpx;
+			}
+		}
 
-  .information {
-    display: flex;
-    justify-content: space-between;
-    font-size: 28rpx;
-    align-items: flex-end;
-    margin: 34rpx 0;
+		.information {
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin: 34rpx 0;
 
-    ._label {
-      font-size: 28rpx;
-      color: #333;
-    }
+			._label {
+				font-size: 28rpx;
+				color: #333;
+			}
 
-    ._title-right {
-      font-size: 28rpx;
-      color: rgba(34, 34, 34, 0.6);
-    }
-  }
+			._title-right {
+				font-size: 28rpx;
+				color: rgba(34, 34, 34, 0.6);
+			}
+		}
 
-  ._bottom {
-    display: flex;
-    justify-content: flex-end;
-    font-size: 28rpx;
-    align-items: flex-end;
-    margin-top: 34rpx;
-  }
-}
-</style>
+		._bottom {
+			display: flex;
+			justify-content: flex-end;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin-top: 34rpx;
+		}
+	}
+</style>

pageD/newBulitOrder/component/goodsInformation.vue

@@ -10,7 +10,7 @@
         <view class="name">{{ i18n.Grosscommodityweight }}</view>
         <view class="money">{{ goodsWeight }}kg</view>
       </view>
-      <view class="back u-flex" v-if="containname">
+<!--      <view class="back u-flex" v-if="containname">
         <image
           src="../../../static/images/warning.png"
           style="width: 32rpx; height: 32rpx"
@@ -23,7 +23,7 @@
             i18n.morefavorable
           }}</text
         >
-      </view>
+      </view> -->
       <view
         class="u-flex u-row-between"
         style="margin-bottom: 40rpx; margin-top: 20rpx"
@@ -36,7 +36,7 @@
       <view class="u-flex u-row-between">
         <view class="name">{{ i18n.freight }}</view>
         <!-- 基础运费乘以公斤数，得出订单运费，最外层Number().toFixed(2)的作用，保留小数点后两位 -->
-        <view class="money">{{
+        <view class="money">{{  
           containname
             ? Number(countGoodsInformation.sum).toFixed(2)
             : i18n.shippingmethod

pageD/newBulitOrder/component/nextLogistics.vue

@@ -123,6 +123,7 @@
 							params: {
 								is_page: 0,
 								province_id: this.goodinfo.province_id,
+								country_id:this.goodinfo.country_id,
 								transport_type_id: this.goodinfo.transport_type_id,
 								weight: Number(this.goodinfo.weight),
 								length: Number(this.goodinfo.length), //		是	String	长

pageD/newBulitOrder/newBulitOrder.vue

@@ -96,6 +96,7 @@
 			return {
 				addinfo: {}, //地址信息
 				province_id: "",
+				country_id:'',
 				containerList: [],
 				transport_type_id: "", //运输方式ID
 				transportTypeName: "", //运输方式名称
@@ -167,6 +168,7 @@
 			//打开选择货柜弹窗
 			openContainer(data) {
 				this.goodinfo.province_id = this.province_id;
+				this.goodinfo.country_id = this.country_id;
 				this.goodinfo.transport_type_id = this.transport_type_id;
 				let weight = 0;
 				let height = 0;
@@ -303,6 +305,7 @@
 							console.log(res);
 							that.addinfo = res;
 							that.province_id = res.province_id;
+							that.country_id = res.country_id
 							that.transport();
 						},
 					},
@@ -315,6 +318,7 @@
 					.get("/api/transport-type", {
 						params: {
 							province_id: this.province_id,
+							country_id:this.country_id
 						},
 					})
 					.then((res) => {

pages/login/login.vue

@@ -14,12 +14,12 @@
 		</button>
 
 
-		<view>
+<!-- 		<view>
 			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
 			<u--input placeholder="请输入内容" border="surround" v-model="code"></u--input>
 		</view>
 		<button @click="submit">登录</button>
-		<button @click="submita">注册</button>
+		<button @click="submita">注册</button> -->
 		<view class="" style="margin-top: 42rpx; display: flex">
 			<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
 				<u-checkbox shape="circle" :customStyle="{ marginBottom: '8px' }" :name="1">

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

@@ -1 +1 @@
-.iitem.data-v-85ac47b2{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-85ac47b2{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.right.data-v-85ac47b2{flex:1;width:474rpx;height:642rpx}.bottom.data-v-85ac47b2{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-85ac47b2{width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.title.data-v-85ac47b2{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-85ac47b2{width:212rpx;height:642rpx}.ititle.data-v-85ac47b2{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.itime.data-v-85ac47b2{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}
+.iitem.data-v-e0e1bd32{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-e0e1bd32{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.right.data-v-e0e1bd32{flex:1;width:474rpx;height:642rpx}.bottom.data-v-e0e1bd32{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-e0e1bd32{width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.title.data-v-e0e1bd32{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-e0e1bd32{width:212rpx;height:642rpx}.ititle.data-v-e0e1bd32{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.itime.data-v-e0e1bd32{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}

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

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

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

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

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"58a5":function(t,n,e){"use strict";e.r(n);var a=e("e7dd"),u=e.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);n["default"]=u.a},"5c83":function(t,n,e){},"67dc":function(t,n,e){"use strict";e.r(n);var a=e("c274"),u=e("58a5");for(var o in u)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(o);e("bba1");var c,i=e("f0c5"),r=Object(i["a"])(u["default"],a["b"],a["c"],!1,null,"4c64a584",null,!1,a["a"],c);n["default"]=r.exports},"9e36":function(t,n,e){"use strict";(function(t,n){var a=e("4ea4");e("f93b");a(e("66fd"));var u=a(e("67dc"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},bba1:function(t,n,e){"use strict";var a=e("5c83"),u=e.n(a);u.a},c274:function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return a}));var u=function(){var t=this,n=t.$createElement;t._self._c},o=[]},e7dd:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=e("970c"),u=function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("edae"))}.bind(null,e)).catch(e.oe)},o={components:{AllRight:u},computed:{i18n:function(){return this.$t("index")}},onShow:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"}),a.conn.close()},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=o}).call(this,e("543d")["default"])}},[["9e36","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"1adf":function(t,n,e){"use strict";var u=e("875b"),a=e.n(u);a.a},"58a5":function(t,n,e){"use strict";e.r(n);var u=e("e7dd"),a=e.n(u);for(var o in u)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(o);n["default"]=a.a},"67dc":function(t,n,e){"use strict";e.r(n);var u=e("c785"),a=e("58a5");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("1adf");var i,c=e("f0c5"),r=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"ee999a36",null,!1,u["a"],i);n["default"]=r.exports},"875b":function(t,n,e){},"9e36":function(t,n,e){"use strict";(function(t,n){var u=e("4ea4");e("f93b");u(e("66fd"));var a=u(e("67dc"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},c785:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return u}));var a=function(){var t=this,n=t.$createElement;t._self._c},o=[]},e7dd:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=e("970c"),a=function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("edae"))}.bind(null,e)).catch(e.oe)},o={components:{AllRight:a},computed:{i18n:function(){return this.$t("index")}},onShow:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.reLaunch({url:"/pages/login/login"}),u.conn.close()},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=o}).call(this,e("543d")["default"])}},[["9e36","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-.page.data-v-4c64a584{padding:20rpx 24rpx}.page .set-top.data-v-4c64a584{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-top .information.data-v-4c64a584{display:flex;justify-content:space-between;align-items:center;width:100%;height:176rpx}.page .set-top .information .information-lift.data-v-4c64a584{display:flex;align-items:center}.page .set-top .information .information-lift .header-img.data-v-4c64a584{border-radius:50%;height:116rpx;width:116rpx;margin-right:20rpx}.page .set-top .information .information-lift .name.data-v-4c64a584{font-size:36rpx}.page .set-top .address.data-v-4c64a584{display:flex;justify-content:space-between;height:106rpx;align-items:center;border-top:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-center.data-v-4c64a584{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-center .security.data-v-4c64a584{display:flex;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2);justify-content:space-between;align-items:center}.page .set-center .switch.data-v-4c64a584{display:flex;justify-content:space-between;height:104rpx;align-items:center}.page .set-bottom.data-v-4c64a584{border-radius:16rpx;padding:0 20rpx;background-color:#fff;margin-top:20rpx}.page .set-bottom .text-1.data-v-4c64a584{display:flex;justify-content:space-between;align-items:center;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-bottom .text-2.data-v-4c64a584{display:flex;justify-content:space-between;align-items:center;height:102rpx}.page .layout.data-v-4c64a584{border-radius:16rpx;background-color:#fff;color:#f83224;font-size:32rpx;height:92rpx;margin-top:20rpx}.page .right-icon.data-v-4c64a584{width:32rpx;height:32rpx}.page .text-right.data-v-4c64a584{display:flex;align-items:center}.page .text-right text.data-v-4c64a584{font-size:30rpx;color:rgba(34,34,34,.5)}
+.page.data-v-ee999a36{padding:20rpx 24rpx}.page .set-top.data-v-ee999a36{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-top .information.data-v-ee999a36{display:flex;justify-content:space-between;align-items:center;width:100%;height:176rpx}.page .set-top .information .information-lift.data-v-ee999a36{display:flex;align-items:center}.page .set-top .information .information-lift .header-img.data-v-ee999a36{border-radius:50%;height:116rpx;width:116rpx;margin-right:20rpx}.page .set-top .information .information-lift .name.data-v-ee999a36{font-size:36rpx}.page .set-top .address.data-v-ee999a36{display:flex;justify-content:space-between;height:106rpx;align-items:center;border-top:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-center.data-v-ee999a36{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-center .security.data-v-ee999a36{display:flex;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2);justify-content:space-between;align-items:center}.page .set-center .switch.data-v-ee999a36{display:flex;justify-content:space-between;height:104rpx;align-items:center}.page .set-bottom.data-v-ee999a36{border-radius:16rpx;padding:0 20rpx;background-color:#fff;margin-top:20rpx}.page .set-bottom .text-1.data-v-ee999a36{display:flex;justify-content:space-between;align-items:center;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-bottom .text-2.data-v-ee999a36{display:flex;justify-content:space-between;align-items:center;height:102rpx}.page .layout.data-v-ee999a36{border-radius:16rpx;background-color:#fff;color:#f83224;font-size:32rpx;height:92rpx;margin-top:20rpx}.page .right-icon.data-v-ee999a36{width:32rpx;height:32rpx}.page .text-right.data-v-ee999a36{display:flex;align-items:center}.page .text-right text.data-v-ee999a36{font-size:30rpx;color:rgba(34,34,34,.5)}

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

@@ -1 +1 @@
-.page.data-v-7ae6b909{padding:20rpx 24rpx}.page .content.data-v-7ae6b909{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-7ae6b909{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-7ae6b909{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-7ae6b909{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-7ae6b909{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-7ae6b909{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-7ae6b909{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-7ae6b909{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-7ae6b909{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-7ae6b909{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}
+.page.data-v-70e0b8e0{padding:20rpx 24rpx}.page .content.data-v-70e0b8e0{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-70e0b8e0{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-70e0b8e0{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-70e0b8e0{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-70e0b8e0{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-70e0b8e0{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-70e0b8e0{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-70e0b8e0{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-70e0b8e0{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-70e0b8e0{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}

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

@@ -1 +1 @@
-<view class="page data-v-b422a402"><block wx:if="{{refundDetail.goods[0].refund.status==1}}"><refund-successful vue-id="40945150-1" refundDetail="{{refundDetail}}" data-event-opts="{{[['^checkMoney',[['checkMoney']]]]}}" bind:checkMoney="__e" class="data-v-b422a402" bind:__l="__l"></refund-successful></block><block wx:if="{{refundDetail.goods[0].refund.status==0}}"><refund-in-progress vue-id="40945150-2" refundDetail="{{refundDetail}}" class="data-v-b422a402" bind:__l="__l"></refund-in-progress></block><block wx:if="{{refundDetail.goods[0].refund.status==2||refundDetail.goods[0].refund.status==3}}"><refusal-to-refund vue-id="40945150-3" refundDetail="{{refundDetail}}" class="data-v-b422a402" bind:__l="__l"></refusal-to-refund></block><refund-information vue-id="40945150-4" goodsDetail="{{refundDetail.goods[0]}}" refundDetail="{{refundDetail}}" language="{{language}}" class="data-v-b422a402" bind:__l="__l"></refund-information><money-destination vue-id="40945150-5" show="{{show}}" refundDetail="{{refundDetail}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-b422a402" bind:__l="__l"></money-destination><block wx:if="{{refundDetail.goods[0].refund.status!=1}}"><view class="footer data-v-b422a402"><button data-event-opts="{{[['tap',[['platformIntervene',['$event']]]]]}}" class="btn data-v-b422a402" bindtap="__e">{{''+i18n.platformIntervention+''}}</button></view></block></view>
+<view class="page data-v-733f103c"><block wx:if="{{refundDetail.goods[0].refund.status==1}}"><refund-successful vue-id="40945150-1" refundDetail="{{refundDetail}}" data-event-opts="{{[['^checkMoney',[['checkMoney']]]]}}" bind:checkMoney="__e" class="data-v-733f103c" bind:__l="__l"></refund-successful></block><block wx:if="{{refundDetail.goods[0].refund.status==0}}"><refund-in-progress vue-id="40945150-2" refundDetail="{{refundDetail}}" class="data-v-733f103c" bind:__l="__l"></refund-in-progress></block><block wx:if="{{refundDetail.goods[0].refund.status==2||refundDetail.goods[0].refund.status==3}}"><refusal-to-refund vue-id="40945150-3" refundDetail="{{refundDetail}}" class="data-v-733f103c" bind:__l="__l"></refusal-to-refund></block><refund-information vue-id="40945150-4" goodsDetail="{{refundDetail.goods[0]}}" refundDetail="{{refundDetail}}" language="{{language}}" class="data-v-733f103c" bind:__l="__l"></refund-information><money-destination vue-id="40945150-5" show="{{show}}" refundDetail="{{refundDetail}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-733f103c" bind:__l="__l"></money-destination><block wx:if="{{refundDetail.goods[0].refund.status==0}}"><view class="footer data-v-733f103c"><button data-event-opts="{{[['tap',[['platformIntervene',['$event']]]]]}}" class="btn data-v-733f103c" bindtap="__e">{{''+i18n.platformIntervention+''}}</button></view></block></view>

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

@@ -1 +1 @@
-.page.data-v-b422a402{padding:20rpx 24rpx;position:relative}.page .footer.data-v-b422a402{position:fixed;bottom:0;padding:20rpx 24rpx 60rpx;background-color:#fff;left:0;width:94%;display:flex;justify-content:flex-end}.page .footer .btn.data-v-b422a402{margin:0;padding:0;background-color:#fff;border:2rpx solid #979797;color:#222;border-radius:44rpx;width:188rpx;height:78rpx;line-height:78rpx;font-size:28rpx}
+.page.data-v-733f103c{padding:20rpx 24rpx;position:relative}.page .footer.data-v-733f103c{position:fixed;bottom:0;padding:20rpx 24rpx 60rpx;background-color:#fff;left:0;width:94%;display:flex;justify-content:flex-end}.page .footer .btn.data-v-733f103c{margin:0;padding:0;background-color:#fff;border:2rpx solid #979797;color:#222;border-radius:44rpx;width:188rpx;height:78rpx;line-height:78rpx;font-size:28rpx}

unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"0ac9":function(t,n,e){},"32c3":function(t,n,e){"use strict";var i=e("0ac9"),o=e.n(i);o.a},"34a9":function(t,n,e){"use strict";e.r(n);var i=e("a93d"),o=e("3c0a");for(var u in o)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(u);e("32c3");var s,a=e("f0c5"),r=Object(a["a"])(o["default"],i["b"],i["c"],!1,null,"07e1c86d",null,!1,i["a"],s);n["default"]=r.exports},"3c0a":function(t,n,e){"use strict";e.r(n);var i=e("65b3"),o=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["default"]=o.a},"65b3":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={props:{itemInfo:{typeof:Object,default:{}},language:{typeof:String,default:""}},computed:{model:function(){if(0==this.itemInfo.status)return"filter: blur(5px);"},deliveryStatus:function(){return"0"==this.itemInfo.status?this.i18n.pendingRefund:"3"==this.itemInfo.status?this.i18n.platformIntervention:"2"==this.itemInfo.status?this.i18n.refuseRefund:"1"==this.itemInfo.status?this.i18n.refunded:void 0},i18n:function(){return this.$t("index")}},data:function(){return{}}};n.default=i},a93d:function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return o})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return i}));var o=function(){var t=this,n=t.$createElement,e=(t._self._c,t.itemInfo.goods.discount_price.split(".")),i=t.itemInfo.goods.discount_price.split("."),o=t.itemInfo.order_goods.amount.split("."),u=t.itemInfo.order_goods.amount.split("."),s=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send),a=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send);t.$mp.data=Object.assign({},{$root:{g0:e,g1:i,g2:o,g3:u,m0:s,m1:a}})},u=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"34a9":function(t,n,e){"use strict";e.r(n);var i=e("53fe"),o=e("3c0a");for(var u in o)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(u);e("3fe6");var s,f=e("f0c5"),a=Object(f["a"])(o["default"],i["b"],i["c"],!1,null,"a6459c4e",null,!1,i["a"],s);n["default"]=a.exports},"3c0a":function(t,n,e){"use strict";e.r(n);var i=e("65b3"),o=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["default"]=o.a},"3fe6":function(t,n,e){"use strict";var i=e("7905"),o=e.n(i);o.a},"53fe":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return o})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return i}));var o=function(){var t=this,n=t.$createElement,e=(t._self._c,t.itemInfo.goods.discount_price.split(".")),i=t.itemInfo.goods.discount_price.split("."),o=t.itemInfo.order_goods.amount.split("."),u=t.itemInfo.order_goods.amount.split("."),s=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send),f=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send);t.$mp.data=Object.assign({},{$root:{g0:e,g1:i,g2:o,g3:u,m0:s,m1:f}})},u=[]},"65b3":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={props:{itemInfo:{typeof:Object,default:{}},language:{typeof:String,default:""}},computed:{model:function(){if(0==this.itemInfo.status)return"filter: blur(5px);"},deliveryStatus:function(){return"0"==this.itemInfo.status?this.i18n.pendingRefund:"3"==this.itemInfo.status?this.i18n.platformIntervention:"2"==this.itemInfo.status?this.i18n.refuseRefund:"1"==this.itemInfo.status?this.i18n.refunded:void 0},i18n:function(){return this.$t("index")}},data:function(){return{}}};n.default=i},7905:function(t,n,e){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesManage/component/detailCard-create-component',
     {

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/ensureRecharge/ensureRecharge"],{1661:function(e,t,n){"use strict";var a=n("d14c"),c=n.n(a);c.a},"36cb":function(e,t,n){"use strict";n.r(t);var a=n("8ed9"),c=n("e736");for(var i in c)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(i);n("1661");var r,u=n("f0c5"),o=Object(u["a"])(c["default"],a["b"],a["c"],!1,null,"2cd42433",null,!1,a["a"],r);t["default"]=o.exports},"428e0":function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("f93b");a(n("66fd"));var c=a(n("36cb"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},"8ed9":function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return c})),n.d(t,"c",(function(){return i})),n.d(t,"a",(function(){return a}));var c=function(){var e=this,t=e.$createElement;e._self._c},i=[]},c74c:function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={data:function(){return{mon:""}},methods:{recharge:function(){e.$u.http.post("/api/recharge",{account_type:"deposit",amount:this.mon}).then((function(t){e.requestPayment({provider:"wxpay",timeStamp:String(t.timeStamp),nonceStr:t.nonceStr,package:t.package,signType:t.signType,paySign:t.paySign,success:function(t){console.log("success:"+JSON.stringify(t)),e.navigateBack()},fail:function(e){console.log("fail:"+JSON.stringify(e))}}),console.log(t)}))},toWithdrawalDetail:function(){e.navigateTo({url:"/pageC/withdrawalDetail/withdrawalDetail"})}},mounted:function(){e.setNavigationBarTitle({title:"保证金充值"})}};t.default=n}).call(this,n("543d")["default"])},d14c:function(e,t,n){},e736:function(e,t,n){"use strict";n.r(t);var a=n("c74c"),c=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(i);t["default"]=c.a}},[["428e0","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/ensureRecharge/ensureRecharge"],{1661:function(e,t,n){"use strict";var a=n("d14c"),c=n.n(a);c.a},"36cb":function(e,t,n){"use strict";n.r(t);var a=n("8ed9"),c=n("e736");for(var i in c)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(i);n("1661");var r,u=n("f0c5"),o=Object(u["a"])(c["default"],a["b"],a["c"],!1,null,"2cd42433",null,!1,a["a"],r);t["default"]=o.exports},"428e":function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("f93b");a(n("66fd"));var c=a(n("36cb"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},"8ed9":function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return c})),n.d(t,"c",(function(){return i})),n.d(t,"a",(function(){return a}));var c=function(){var e=this,t=e.$createElement;e._self._c},i=[]},c74c:function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={data:function(){return{mon:""}},methods:{recharge:function(){e.$u.http.post("/api/recharge",{account_type:"deposit",amount:this.mon}).then((function(t){e.requestPayment({provider:"wxpay",timeStamp:String(t.timeStamp),nonceStr:t.nonceStr,package:t.package,signType:t.signType,paySign:t.paySign,success:function(t){console.log("success:"+JSON.stringify(t)),e.navigateBack()},fail:function(e){console.log("fail:"+JSON.stringify(e))}}),console.log(t)}))},toWithdrawalDetail:function(){e.navigateTo({url:"/pageC/withdrawalDetail/withdrawalDetail"})}},mounted:function(){e.setNavigationBarTitle({title:"保证金充值"})}};t.default=n}).call(this,n("543d")["default"])},d14c:function(e,t,n){},e736:function(e,t,n){"use strict";n.r(t);var a=n("c74c"),c=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(i);t["default"]=c.a}},[["428e","common/runtime","common/vendor"]]]);

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(t,n,e){"use strict";e.r(n);var o=e("b30c"),u=e("a76f");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("a5b7");var f,r=e("f0c5"),i=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"0e4843a6",null,!1,o["a"],f);n["default"]=i.exports},"67aa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},containname:{typeof:String,default:""},goodsPrice:{typeof:String,default:""},countGoodsInformation:{typeof:Object,default:function(){return{}}},goodsValue:{typeof:Number,default:0},goodsWeight:{typeof:Number,default:0},specificationsPrice:{typeof:Number,default:0}},computed:{i18n:function(){return this.$t("index")}}};n.default=o},a5b7:function(t,n,e){"use strict";var o=e("dc9b"),u=e.n(o);u.a},a76f:function(t,n,e){"use strict";e.r(n);var o=e("67aa"),u=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=u.a},b30c:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.containname?Number(t.countGoodsInformation.sum).toFixed(2):null);t.$mp.data=Object.assign({},{$root:{g0:e}})},a=[]},dc9b:function(t,n,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(t,n,e){"use strict";e.r(n);var o=e("f05ad"),u=e("a76f");for(var f in u)["default"].indexOf(f)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(f);e("64dd");var a,r=e("f0c5"),i=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"ef072f6c",null,!1,o["a"],a);n["default"]=i.exports},5853:function(t,n,e){},"64dd":function(t,n,e){"use strict";var o=e("5853"),u=e.n(o);u.a},"67aa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},containname:{typeof:String,default:""},goodsPrice:{typeof:String,default:""},countGoodsInformation:{typeof:Object,default:function(){return{}}},goodsValue:{typeof:Number,default:0},goodsWeight:{typeof:Number,default:0},specificationsPrice:{typeof:Number,default:0}},computed:{i18n:function(){return this.$t("index")}}};n.default=o},a76f:function(t,n,e){"use strict";e.r(n);var o=e("67aa"),u=e.n(o);for(var f in o)["default"].indexOf(f)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(f);n["default"]=u.a},f05ad:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return f})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.containname?Number(t.countGoodsInformation.sum).toFixed(2):null);t.$mp.data=Object.assign({},{$root:{g0:e}})},f=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/goodsInformation-create-component',
     {

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

@@ -1 +1 @@
-<view class="list data-v-0e4843a6"><view class="abount data-v-0e4843a6" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-0e4843a6" style="margin-bottom:40rpx;"><view class="name data-v-0e4843a6">{{i18n.Commodityamount}}</view><view class="money data-v-0e4843a6">{{'¥'+specificationsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-0e4843a6"><view class="name data-v-0e4843a6">{{i18n.Grosscommodityweight}}</view><view class="money data-v-0e4843a6">{{goodsWeight+"kg"}}</view></view></block><block wx:if="{{containname}}"><view class="back u-flex data-v-0e4843a6"><image style="width:32rpx;height:32rpx;" src="../../../static/images/warning.png" mode class="data-v-0e4843a6"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-0e4843a6">{{i18n.buy+countGoodsInformation.max_weight+"kg"+i18n.price+"¥"+countGoodsInformation.unit_fee+"，"+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-0e4843a6" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-0e4843a6">{{i18n.Costperkilogram}}</view><view class="money data-v-0e4843a6">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-0e4843a6"><view class="name data-v-0e4843a6">{{i18n.freight}}</view><view class="money data-v-0e4843a6">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-0e4843a6"><view class="data-v-0e4843a6"><text class="small data-v-0e4843a6">{{i18n.subtotal}}</text><text class="mon data-v-0e4843a6">¥</text><text class="mon data-v-0e4843a6" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>
+<view class="list data-v-ef072f6c"><view class="abount data-v-ef072f6c" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-ef072f6c" style="margin-bottom:40rpx;"><view class="name data-v-ef072f6c">{{i18n.Commodityamount}}</view><view class="money data-v-ef072f6c">{{'¥'+specificationsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-ef072f6c"><view class="name data-v-ef072f6c">{{i18n.Grosscommodityweight}}</view><view class="money data-v-ef072f6c">{{goodsWeight+"kg"}}</view></view></block><view class="u-flex u-row-between data-v-ef072f6c" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-ef072f6c">{{i18n.Costperkilogram}}</view><view class="money data-v-ef072f6c">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-ef072f6c"><view class="name data-v-ef072f6c">{{i18n.freight}}</view><view class="money data-v-ef072f6c">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-ef072f6c"><view class="data-v-ef072f6c"><text class="small data-v-ef072f6c">{{i18n.subtotal}}</text><text class="mon data-v-ef072f6c">¥</text><text class="mon data-v-ef072f6c" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>

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

@@ -1 +1 @@
-.list .abount.data-v-0e4843a6{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-0e4843a6{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-0e4843a6{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-0e4843a6{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-0e4843a6{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-0e4843a6{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-0e4843a6{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}
+.list .abount.data-v-ef072f6c{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-ef072f6c{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-ef072f6c{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-ef072f6c{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-ef072f6c{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-ef072f6c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-ef072f6c{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}

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

@@ -1 +1 @@
-.poptitle.data-v-afbe9a48{width:142rpx;height:50rpx;font-family:PingFangSC,PingFang SC;font-weight:600;font-size:36rpx;color:#333;text-align:center;width:100%}.transport.data-v-afbe9a48{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-afbe9a48{font-family:PingFangSC,PingFang SC;font-weight:550;font-size:32rpx;color:#333;line-height:44rpx;text-align:left;font-style:normal}.chest.data-v-afbe9a48{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-afbe9a48{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-afbe9a48{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-afbe9a48{width:398rpx;height:84rpx;background:#f83224;border-radius:42rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.enbottom .cancel.data-v-afbe9a48{width:280rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.3);font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#444;line-height:84rpx;text-align:center;font-style:normal}
+.poptitle.data-v-f866364e{width:142rpx;height:50rpx;font-family:PingFangSC,PingFang SC;font-weight:600;font-size:36rpx;color:#333;text-align:center;width:100%}.transport.data-v-f866364e{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-f866364e{font-family:PingFangSC,PingFang SC;font-weight:550;font-size:32rpx;color:#333;line-height:44rpx;text-align:left;font-style:normal}.chest.data-v-f866364e{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-f866364e{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-f866364e{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-f866364e{width:398rpx;height:84rpx;background:#f83224;border-radius:42rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.enbottom .cancel.data-v-f866364e{width:280rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.3);font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#444;line-height:84rpx;text-align:center;font-style:normal}

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

@@ -1 +1 @@
-.page.data-v-2a84f83c{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-2a84f83c{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-2a84f83c{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-2a84f83c{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}.page .logistics.data-v-2a84f83c{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-2a84f83c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#f83224;line-height:40rpx;text-align:left;font-style:normal;margin-right:8rpx}.page .btn.data-v-2a84f83c{width:750rpx;height:166rpx;background:#fff;box-shadow:0rpx -1rpx 0rpx 0rpx rgba(0,0,0,.05);position:fixed;bottom:0;left:0;padding:0 24rpx 5rpx 5rpx;box-sizing:border-box}.page .btn .money.data-v-2a84f83c{font-family:HarmonyOS_Sans_Medium;font-size:48rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.page .btn .kg.data-v-2a84f83c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;line-height:34rpx;text-align:left;font-style:normal}.page .btn .order.data-v-2a84f83c{width:232rpx;height:80rpx;background:#f83224;border-radius:40rpx;font-family:PingFangTC;font-weight:500;font-size:32rpx;color:#fff;line-height:80rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.page.data-v-0bc34cc7{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-0bc34cc7{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-0bc34cc7{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-0bc34cc7{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}.page .logistics.data-v-0bc34cc7{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-0bc34cc7{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#f83224;line-height:40rpx;text-align:left;font-style:normal;margin-right:8rpx}.page .btn.data-v-0bc34cc7{width:750rpx;height:166rpx;background:#fff;box-shadow:0rpx -1rpx 0rpx 0rpx rgba(0,0,0,.05);position:fixed;bottom:0;left:0;padding:0 24rpx 5rpx 5rpx;box-sizing:border-box}.page .btn .money.data-v-0bc34cc7{font-family:HarmonyOS_Sans_Medium;font-size:48rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.page .btn .kg.data-v-0bc34cc7{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;line-height:34rpx;text-align:left;font-style:normal}.page .btn .order.data-v-0bc34cc7{width:232rpx;height:80rpx;background:#f83224;border-radius:40rpx;font-family:PingFangTC;font-weight:500;font-size:32rpx;color:#fff;line-height:80rpx;text-align:center;font-style:normal;margin-left:20rpx}

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/resultFeedback/resultFeedback"],{"2a48d":function(t,n,e){"use strict";(function(t,n){var a=e("4ea4");e("f93b");a(e("66fd"));var i=a(e("f6a8"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(i.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"826c":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"8416c":function(t,n,e){},"88a2":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{code:"111",information:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{cope:function(n){t.setClipboardData({data:n,success:function(){t.showToast({title:this.i18n.replicatingSuccess,icon:"none"})}})},back:function(){t.switchTab({url:"/pages/index/index"})},resetSubmit:function(){t.navigateTo({url:"/pageD/settleIn/settleIn"})},getInfo:function(){var n=this;t.$u.http.post("/api/merchant/status").then((function(t){n.information=t}))}},created:function(){this.getInfo(),t.setNavigationBarTitle({title:this.i18n.resultFeedback})}};n.default=e}).call(this,e("543d")["default"])},"9b37":function(t,n,e){"use strict";var a=e("8416c"),i=e.n(a);i.a},f149:function(t,n,e){"use strict";e.r(n);var a=e("88a2"),i=e.n(a);for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);n["default"]=i.a},f6a8:function(t,n,e){"use strict";e.r(n);var a=e("826c"),i=e("f149");for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);e("9b37");var u,o=e("f0c5"),r=Object(o["a"])(i["default"],a["b"],a["c"],!1,null,"6814add8",null,!1,a["a"],u);n["default"]=r.exports}},[["2a48d","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/resultFeedback/resultFeedback"],{"2a48":function(t,n,e){"use strict";(function(t,n){var a=e("4ea4");e("f93b");a(e("66fd"));var i=a(e("f6a8"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(i.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"826c":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"8416c":function(t,n,e){},"88a2":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{code:"111",information:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{cope:function(n){t.setClipboardData({data:n,success:function(){t.showToast({title:this.i18n.replicatingSuccess,icon:"none"})}})},back:function(){t.switchTab({url:"/pages/index/index"})},resetSubmit:function(){t.navigateTo({url:"/pageD/settleIn/settleIn"})},getInfo:function(){var n=this;t.$u.http.post("/api/merchant/status").then((function(t){n.information=t}))}},created:function(){this.getInfo(),t.setNavigationBarTitle({title:this.i18n.resultFeedback})}};n.default=e}).call(this,e("543d")["default"])},"9b37":function(t,n,e){"use strict";var a=e("8416c"),i=e.n(a);i.a},f149:function(t,n,e){"use strict";e.r(n);var a=e("88a2"),i=e.n(a);for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);n["default"]=i.a},f6a8:function(t,n,e){"use strict";e.r(n);var a=e("826c"),i=e("f149");for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);e("9b37");var u,o=e("f0c5"),r=Object(o["a"])(i["default"],a["b"],a["c"],!1,null,"6814add8",null,!1,a["a"],u);n["default"]=r.exports}},[["2a48","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json

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

unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

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

unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

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

unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json

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

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

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

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

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