冲突

components/kj-flow/kj-flow.vue

@@ -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;

pageA/counter.vue

@@ -4,7 +4,7 @@
 		<!-- 城市 -->
 		<view class="add u-flex u-row-around">
 			<!-- <text class='address' @click="change(0)">{{original||i18n.Starting}}</text> -->
-			<text class='address' >{{i18n.inland}}</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>
@@ -17,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>
@@ -92,7 +92,9 @@ 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">
@@ -126,7 +128,7 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 				index: 0,
 				domestic: 1,
 				province_id: '',
-				country_id:'',
+				country_id: '',
 				goodstype: 'normal',
 				container_id: '', //货柜id
 				leftname: '',
@@ -169,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();
@@ -177,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 == '') {
@@ -200,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
@@ -264,31 +292,59 @@ 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
 				}
 			}

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/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)

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>

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

@@ -1 +1 @@
-.iitem.data-v-0f83aaac{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-0f83aaac{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.right.data-v-0f83aaac{flex:1;width:474rpx;height:642rpx}.bottom.data-v-0f83aaac{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-0f83aaac{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-0f83aaac{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-0f83aaac{width:212rpx;height:642rpx}.ititle.data-v-0f83aaac{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-0f83aaac{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/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/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/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
 }

unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,15 +9,10 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.4.3",
+  "libVersion": "",
   "appid": "wx84ab1b5d609b805d",
   "projectname": "kjds",
   "condition": {
@@ -38,9 +32,5 @@
       "current": -1,
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }

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

@@ -58,6 +58,27 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pageB/goods",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pageB/recipientinfo",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pageA/counter",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }