zhaogongxue 6 mesi fa
parent
commit
1d084f4384
60 ha cambiato i file con 415 aggiunte e 405 eliminazioni
  1. 6 0
      components/kj-express/kj-express.vue
  2. 12 2
      components/kj-flow/kj-flow.vue
  3. 358 376
      components/kj-tabbar/kj-tabbar.vue
  4. 6 6
      pageA/chat/chat.vue
  5. 4 0
      pageA/order.vue
  6. 8 5
      pageA/service/service.vue
  7. 1 0
      pageD/newBulitOrder/component/nextLogistics.vue
  8. 4 0
      pageD/newBulitOrder/newBulitOrder.vue
  9. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  10. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.js
  11. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxml
  12. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  13. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml
  14. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  15. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.wxml
  16. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.js
  17. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.wxml
  18. 0 0
      unpackage/dist/build/mp-weixin/pageC/refundDetail/refundDetail.js
  19. 1 1
      unpackage/dist/build/mp-weixin/pageC/refundDetail/refundDetail.wxml
  20. 1 1
      unpackage/dist/build/mp-weixin/pageC/refundDetail/refundDetail.wxss
  21. 1 1
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.js
  22. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxml
  23. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxss
  24. 1 1
      unpackage/dist/build/mp-weixin/pageD/ensureRecharge/ensureRecharge.js
  25. 2 2
      unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-express/kj-express.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/component/nextLogistics.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/newBulitOrder.js.map
  34. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.js
  35. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.wxml
  36. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-flow/kj-flow.js
  37. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-flow/kj-flow.wxml
  38. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  39. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/chat.wxml
  40. 0 0
      unpackage/dist/dev/mp-weixin/pageA/counter.wxml
  41. 0 0
      unpackage/dist/dev/mp-weixin/pageA/order.js
  42. 0 0
      unpackage/dist/dev/mp-weixin/pageA/order.wxml
  43. 0 0
      unpackage/dist/dev/mp-weixin/pageA/service/service.wxml
  44. 0 0
      unpackage/dist/dev/mp-weixin/pageA/shoplist.wxml
  45. 0 0
      unpackage/dist/dev/mp-weixin/pageA/subsidy.wxml
  46. 0 0
      unpackage/dist/dev/mp-weixin/pageB/ParcelExpress.wxml
  47. 1 1
      unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml
  48. 0 0
      unpackage/dist/dev/mp-weixin/pageB/account.wxml
  49. 0 0
      unpackage/dist/dev/mp-weixin/pageB/delivery.wxml
  50. 0 0
      unpackage/dist/dev/mp-weixin/pageB/end.wxml
  51. 0 0
      unpackage/dist/dev/mp-weixin/pageB/goods.wxml
  52. 0 0
      unpackage/dist/dev/mp-weixin/pageB/myPackage.wxml
  53. 0 0
      unpackage/dist/dev/mp-weixin/pageB/recipientinfo.wxml
  54. 1 1
      unpackage/dist/dev/mp-weixin/pageB/search.wxml
  55. 0 0
      unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/nextLogistics.js
  56. 0 0
      unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/newBulitOrder.js
  57. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json
  58. 2 2
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json
  59. 2 2
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json
  60. 2 2
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action/u-swipe-action.json

+ 6 - 0
components/kj-express/kj-express.vue

@@ -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;
             },
           },
         });

+ 12 - 2
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;"
@@ -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);

+ 358 - 376
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>

+ 6 - 6
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>
 

+ 4 - 0
pageA/order.vue

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

+ 8 - 5
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> 

+ 1 - 0
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	长

+ 4 - 0
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) => {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/refundDetail/refundDetail.js


+ 1 - 1
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>

+ 1 - 1
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}

+ 1 - 1
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',
     {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxss


+ 1 - 1
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"]]]);

+ 2 - 2
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
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-express/kj-express.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/component/nextLogistics.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/newBulitOrder.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-flow/kj-flow.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-flow/kj-flow.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/chat.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/counter.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/order.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/order.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/service/service.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/shoplist.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/subsidy.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/ParcelExpress.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml

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

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/account.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/delivery.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/end.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/goods.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/myPackage.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/recipientinfo.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pageB/search.wxml

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

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/nextLogistics.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/newBulitOrder.js


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

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

+ 2 - 2
unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json

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

+ 2 - 2
unpackage/dist/dev/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
+  }
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action/u-swipe-action.json

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

Some files were not shown because too many files changed in this diff