mabaoyi il y a 3 mois
Parent
commit
8e06e25d39
100 fichiers modifiés avec 1975 ajouts et 1999 suppressions
  1. 9 4
      commont/messages.js
  2. 3 3
      components/kj-chat/kj-chat.vue
  3. 937 1081
      components/kj-express/kj-express.vue
  4. 28 11
      components/kj-flow/kj-flow.vue
  5. 123 0
      node_modules/.vue-global-types/vue_3.3_false.d.ts
  6. 1 1
      pageA/chat/chat.vue
  7. 3 3
      pageA/chat/news.vue
  8. 3 3
      pageA/chat/search.vue
  9. 2 2
      pageA/payorder.vue
  10. 8 10
      pageA/productdetails.vue
  11. 1 1
      pageA/service/service.vue
  12. 1 1
      pageA/shoplist.vue
  13. 2 2
      pageB/end.vue
  14. 24 3
      pageB/expresstype.vue
  15. 12 3
      pageB/orderinfo.vue
  16. 8 5
      pageB/recipientinfo.vue
  17. 4 3
      pageB/search.vue
  18. 412 408
      pageC/addEditAddress/addEditAddress.vue
  19. 326 393
      pageC/internationalAddress/internationalAddress.vue
  20. 39 33
      pages/index/index.vue
  21. 3 3
      pages/login/login.vue
  22. 1 1
      pages/mine/component/teamFunction.vue
  23. 0 0
      unpackage/dist/build/mp-weixin/common/runtime.js
  24. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  25. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.js
  26. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxml
  27. 0 0
      unpackage/dist/build/mp-weixin/components/kj-express/kj-express.js
  28. 0 0
      unpackage/dist/build/mp-weixin/components/kj-express/kj-express.wxml
  29. 0 0
      unpackage/dist/build/mp-weixin/components/kj-express/kj-express.wxss
  30. 0 0
      unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.js
  31. 0 0
      unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxml
  32. 1 1
      unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxss
  33. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  34. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml
  35. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  36. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.wxml
  37. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/search.js
  38. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/search.wxml
  39. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.js
  40. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.wxml
  41. 1 1
      unpackage/dist/build/mp-weixin/pageA/payorder.wxss
  42. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.js
  43. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxml
  44. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxss
  45. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.js
  46. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoplist.js
  47. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoplist.wxml
  48. 1 1
      unpackage/dist/build/mp-weixin/pageA/shoplist.wxss
  49. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.js
  50. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxml
  51. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxss
  52. 0 0
      unpackage/dist/build/mp-weixin/pageB/expresstype.js
  53. 1 0
      unpackage/dist/build/mp-weixin/pageB/expresstype.json
  54. 1 1
      unpackage/dist/build/mp-weixin/pageB/expresstype.wxml
  55. 1 1
      unpackage/dist/build/mp-weixin/pageB/expresstype.wxss
  56. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.js
  57. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.wxml
  58. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.wxss
  59. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.js
  60. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml
  61. 0 0
      unpackage/dist/build/mp-weixin/pageB/search.js
  62. 1 1
      unpackage/dist/build/mp-weixin/pageB/search.wxml
  63. 1 1
      unpackage/dist/build/mp-weixin/pageB/search.wxss
  64. 0 0
      unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.js
  65. 0 0
      unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.wxml
  66. 0 1
      unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.wxss
  67. 0 0
      unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.js
  68. 0 0
      unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.wxml
  69. 1 1
      unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.wxss
  70. 1 1
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/refusePopup.js
  71. 0 0
      unpackage/dist/build/mp-weixin/pageD/logisticsProgress/logisticsProgress.js
  72. 0 0
      unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.js
  73. 0 0
      unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.wxml
  74. 1 1
      unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.wxss
  75. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  76. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  77. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  78. 0 0
      unpackage/dist/build/mp-weixin/pages/login/login.js
  79. 1 1
      unpackage/dist/build/mp-weixin/pages/login/login.wxml
  80. 1 1
      unpackage/dist/build/mp-weixin/pages/login/login.wxss
  81. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json
  82. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json
  83. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json
  84. 1 1
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.js
  85. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json
  86. 0 0
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.wxml
  87. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  88. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  89. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map
  90. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-express/kj-express.js.map
  91. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map
  92. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  93. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map
  94. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/search.js.map
  95. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/payorder.js.map
  96. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map
  97. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map
  98. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoplist.js.map
  99. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/end.js.map
  100. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/expresstype.js.map

+ 9 - 4
commont/messages.js

@@ -614,7 +614,9 @@ export default {
 	  Photoalbum:'相册',
 	  shoot:'拍摄',
 	  Voice:'语音',
-	  Myorder:'我的订单'
+	  Myorder:'我的订单',
+	  
+	  logisticsmethod:'请选择物流方式'
     },
   },
   //英语
@@ -1240,7 +1242,8 @@ export default {
 	  Photoalbum: 'Photo album',
 	  shoot: 'Take photo',
 	  Voice: 'Voice',
-	  Myorder: 'My Order'
+	  Myorder: 'My Order',
+	  logisticsmethod:'Please select a logistics method'
     },
   },
   // 西班牙
@@ -1882,7 +1885,8 @@ export default {
 	  Photoalbum: 'Álbum de fotos',
 	  shoot: 'Capturar',
 	  Voice: 'Voz',
-	  Myorder: 'Mi pedido'
+	  Myorder: 'Mi pedido',
+	  logisticsmethod:'Por favor seleccione el método logístico'
     },
   },
   //意大利
@@ -2516,7 +2520,8 @@ export default {
 	  Photoalbum: 'Album fotografico',
 	  shoot: 'Scatta',
 	  Voice: 'Voce',
-	  Myorder: 'Il Mio Ordine'
+	  Myorder: 'Il Mio Ordine',
+	  logisticsmethod:'La prego di scegliere la logistica'
     },
   },
 };

+ 3 - 3
components/kj-chat/kj-chat.vue

@@ -71,7 +71,7 @@
 						{{i18n.Voice}}
 					</view>
 				</view>
-				<view v-if="user_no!='13523652365'&&to=='13523652365'" class="more-item u-flex-col u-col-center"
+				<view v-if="user_no!='19550568052'&&to=='19550568052'" class="more-item u-flex-col u-col-center"
 					style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
 					@click="show = true">
 					<view class="item-img u-flex u-row-center">
@@ -336,7 +336,7 @@
 				msg.set({
 					type: "txt",
 					msg: this.i18n.Ordermessage,
-					to: '13523652365',
+					to: '19550568052',
 					chatType: "singleChat",
 					ext: {
 						type: "orderinfo",
@@ -348,7 +348,7 @@
 						id:id
 					},
 					success: function(id, serverMsgId) {
-						_this.addinfo(item.order.order_no,_this.user_no,'13523652365',id)
+						_this.addinfo(item.order.order_no,_this.user_no,'19550568052',id)
 						setTimeout(() => {
 							_this.$emit('success', true)
 						}, 800);

+ 937 - 1081
components/kj-express/kj-express.vue

@@ -1,1177 +1,1033 @@
 <template>
-  <!-- 商城 -->
-  <scroll-view
-    class=""
-    scroll-y="true"
-    style="height: calc(100vh - 300rpx); padding: 0 24rpx"
-  >
-    <view style="position: relative; padding-bottom: 20rpx">
-      <!-- 自定义导航栏 -->
-      <image
-        src="../../static/images/index/back.png"
-        style="
+	<!-- 商城 -->
+	<view class="">
+
+
+		<scroll-view class="" scroll-y="true" style="height: calc(100vh - 300rpx); padding: 0 24rpx">
+			<view style="position: relative; padding-bottom: 20rpx">
+				<!-- 自定义导航栏 -->
+				<image src="../../static/images/index/back.png" style="
           width: 750rpx;
           height: 1200rpx;
           position: absolute;
           top: 0;
           z-index: -1;
           left: -24rpx;
-        "
-        mode=""
-      >
-      </image>
-      <!-- 地址 -->
-      <view class="address">
-        <view class="left u-flex" style="display: flex">
-          <view
-            class="u-row-between left"
-            style="display: flex; flex-direction: column"
-          >
-            <image
-              src="../../static/express/ji.png"
-              style="width: 40rpx; height: 40rpx"
-              mode=""
-            ></image>
-            <image
-              @click="changeadd"
-              src="../../static/express/change.png"
-              style="width: 40rpx; height: 40rpx"
-              mode=""
-            >
-            </image>
-          </view>
-          <view
-            class="u-row-between left"
-            style="
+        " mode="">
+				</image>
+				<!-- 地址 -->
+				<view class="address">
+					<view class="left u-flex" style="display: flex">
+						<view class="u-row-between left" style="display: flex; flex-direction: column">
+							<image src="../../static/express/ji.png" style="width: 40rpx; height: 40rpx" mode="">
+							</image>
+							<image @click="changeadd" src="../../static/express/change.png"
+								style="width: 40rpx; height: 40rpx" mode="">
+							</image>
+						</view>
+						<view class="u-row-between left" style="
               flex: 1;
               margin-left: 28rpx;
               border-bottom: 2rpx solid rgba(151, 151, 151, 0.08);
               display: flex;
-            "
-          >
-            <view
-              v-if="JSON.stringify(topadd) == '{}'"
-              class="u-row-between"
-              style=""
-              @click="send"
-            >
-              <view class="pople">{{ i18n.sender }}</view>
-              <view class="jiadd" style="margin-top: 14rpx">{{
+            ">
+							<view v-if="JSON.stringify(topadd) == '{}'" class="u-row-between" style="" @click="send">
+								<view class="pople">{{ i18n.sender }}</view>
+								<view class="jiadd" style="margin-top: 14rpx">{{
                 i18n.informat
               }}</view>
-            </view>
-            <view v-else class="u-row-between" style="" @click="send">
-              <view class="">
-                <text class="topname">{{ topadd.name }}</text>
-                <text class="topaddress" style="margin-left: 8rpx">{{
+							</view>
+							<view v-else class="u-row-between" style="" @click="send">
+								<view class="">
+									<text class="topname">{{ topadd.name }}</text>
+									<text class="topaddress" style="margin-left: 8rpx">{{
                   replacePhoneToStar(topadd.mobile)
                 }}</text>
-              </view>
-              <view class="topaddress" style="margin-top: 14rpx">{{
+								</view>
+								<view class="topaddress" style="margin-top: 14rpx">{{
                 topadd.full_address
               }}</view>
-            </view>
-            <view class="u-flex" @click.stop="addbook(1)">
-              <view class="" style="color: rgba(151, 151, 151, 1)">|</view>
-              <text class="right">{{ i18n.addressbook }}</text>
-            </view>
-          </view>
-        </view>
-        <view
-          class="left u-flex"
-          style="
+							</view>
+							<view class="u-flex" @click.stop="addbook(1)">
+								<view class="" style="color: rgba(151, 151, 151, 1)">|</view>
+								<text class="right">{{ i18n.addressbook }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="left u-flex" style="
             display: flex;
             margin-top: 26rpx;
             border-bottom: 2rpx solid rgba(151, 151, 151, 0.08);
-          "
-        >
-          <view
-            class="u-row-between left"
-            style="display: flex; flex-direction: column"
-          >
-            <image
-              src="../../static/express/shou.png"
-              style="width: 40rpx; height: 40rpx"
-              mode=""
-            ></image>
-            <!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
-            <!-- </image> -->
-          </view>
-          <view
-            class="u-row-between left"
-            style="flex: 1; margin-left: 28rpx; display: flex"
-          >
-            <view
-              v-if="JSON.stringify(bottomadd) == '{}'"
-              class="u-row-between"
-              style=""
-              @click="recipirnt"
-            >
-              <view class="pople">{{ i18n.recipient }}</view>
-              <view class="jiadd" style="margin-top: 14rpx">{{
+          ">
+						<view class="u-row-between left" style="display: flex; flex-direction: column">
+							<image src="../../static/express/shou.png" style="width: 40rpx; height: 40rpx" mode="">
+							</image>
+							<!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
+							<!-- </image> -->
+						</view>
+						<view class="u-row-between left" style="flex: 1; margin-left: 28rpx; display: flex">
+							<view v-if="JSON.stringify(bottomadd) == '{}'" class="u-row-between" style=""
+								@click="recipirnt">
+								<view class="pople">{{ i18n.recipient }}</view>
+								<view class="jiadd" style="margin-top: 14rpx">{{
                 i18n.informate
               }}</view>
-            </view>
-            <view v-else class="u-row-between" style="" @click="recipirnt">
-              <view class="">
-                <text class="topname">{{ bottomadd.name }}</text>
-                <text class="topaddress" style="margin-left: 8rpx">{{
+							</view>
+							<view v-else class="u-row-between" style="" @click="recipirnt">
+								<view class="">
+									<text class="topname">{{ bottomadd.name }}</text>
+									<text class="topaddress" style="margin-left: 8rpx">{{
                   replacePhoneToStar(bottomadd.mobile)
                 }}</text>
-              </view>
-              <view class="topaddress" style="margin-top: 14rpx">{{
+								</view>
+								<view class="topaddress" style="margin-top: 14rpx">{{
                 bottomadd.full_address
               }}</view>
-            </view>
-            <view class="u-flex" @click.stop="addbook(0)">
-              <view class="" style="color: rgba(151, 151, 151, 1)">|</view>
-              <text class="right">{{ i18n.addressbook }}</text>
-            </view>
-          </view>
-        </view>
-        <!-- 物品信息 -->
-        <view class="info u-flex u-row-between">
-          <view class="u-flex">
-            <text class="wupin">{{ i18n.item }}</text>
-            <view class="mast">{{ i18n.required }}</view>
-          </view>
-          <view
-            v-if="JSON.stringify(goodinfo) === '{}'"
-            class="u-flex"
-            @click="goods"
-          >
-            <view class="change">{{ i18n.selection }}</view>
-            <image
-              src="../../static/express/next1.png"
-              style="width: 28rpx; height: 28rpx; margin-left: 6rpx"
-              mode=""
-            ></image>
-          </view>
-          <view v-else class="goodname" @click="goods">
-            {{ goodinfo.goodname }},{{ goodinfo.weight }}kg
-          </view>
-        </view>
-        <!-- 跨境物流 -->
-        <view class="info u-flex u-row-between">
-          <view class="u-flex">
-            <text class="wupin">{{ i18n.flow }}</text>
-          </view>
-          <view class="u-flex" @click="changewu">
-            <!-- <text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text> -->
-            <text class="change" style="color: rgba(248, 50, 36, 1)">{{
+							</view>
+							<view class="u-flex" @click.stop="addbook(0)">
+								<view class="" style="color: rgba(151, 151, 151, 1)">|</view>
+								<text class="right">{{ i18n.addressbook }}</text>
+							</view>
+						</view>
+					</view>
+					<!-- 物品信息 -->
+					<view class="info u-flex u-row-between">
+						<view class="u-flex">
+							<text class="wupin">{{ i18n.item }}</text>
+							<view class="mast">{{ i18n.required }}</view>
+						</view>
+						<view v-if="JSON.stringify(goodinfo) === '{}'" class="u-flex" @click="goods">
+							<view class="change">{{ i18n.selection }}</view>
+							<image src="../../static/express/next1.png"
+								style="width: 28rpx; height: 28rpx; margin-left: 6rpx" mode=""></image>
+						</view>
+						<view v-else class="goodname" @click="goods">
+							{{ goodinfo.goodname }},{{ goodinfo.weight }}kg
+						</view>
+					</view>
+					<!-- 跨境物流 -->
+					<view class="info u-flex u-row-between">
+						<view class="u-flex">
+							<text class="wupin">{{ i18n.flow }}</text>
+						</view>
+						<view class="u-flex" @click="changewu">
+							<!-- <text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text> -->
+							<text class="change" style="color: rgba(248, 50, 36, 1)">{{
               leftname ? leftname + " |  " + rightname : i18n.selection
             }}</text>
-            <image
-              v-if="leftname == ''"
-              src="../../static/express/next1.png"
-              style="width: 28rpx; height: 28rpx; margin-left: 6rpx"
-              mode=""
-            ></image>
-          </view>
-        </view>
-        <!-- 去寄件 -->
-        <view class="" style="margin-top: 34rpx">
-          <view class="mail" @click="todev">
-            {{ i18n.mail }}
-          </view>
-        </view>
-        <view class="bottom u-flex u-row-between">
-          <button
-            style="
+							<image v-if="leftname == ''" src="../../static/express/next1.png"
+								style="width: 28rpx; height: 28rpx; margin-left: 6rpx" mode=""></image>
+						</view>
+					</view>
+					<!-- 去寄件 -->
+					<view class="" style="margin-top: 34rpx">
+						<view class="mail" @click="todev">
+							{{ i18n.mail }}
+						</view>
+					</view>
+					<view class="bottom u-flex u-row-between">
+						<button style="
               background-color: transparent;
               padding-left: 0 !important;
               padding-right: 0 !important;
               margin: 0 !important;
-            "
-            open-type="share"  
-            class="u-flex"
-          >
-            <image
-              src="../../static/express/share.png"
-              style="width: 36rpx; height: 36rpx"
-              mode=""
-            ></image>
-            <text class="friend">{{ i18n.share }}</text>
-          </button>
-          <view class="friend">|</view>
-          <view class="u-flex" @click="counter">
-            <image
-              src="/static/images/index/compile.png"
-              style="width: 36rpx; height: 36rpx"
-              mode=""
-            >
-            </image>
-            <text class="friend">{{ i18n.compute }}</text>
-          </view>
-        </view>
-      </view>
-      <!-- 我的包裹 -->
-      <view class="parcel">
-        <view class="u-flex u-row-between">
-          <view class="myparcel">
-            <text>{{ i18n.mine }}</text>
-            <text style="color: rgba(248, 50, 36, 1)">{{ i18n.parcel }}</text>
-          </view>
-          <view class="add u-flex">
-            <image
-              src="../../static/express/add.png"
-              mode=""
-              style="width: 44rpx; height: 44rpx"
-            ></image>
-            <text class="addtext" @click="toparcel">{{ i18n.addsign }}</text>
-          </view>
-        </view>
-        <view class="u-flex u-row-around" style="margin-top: 44rpx">
-          <view class="flexc" @click="pack('to_transit')">
-            <view
-              class=""
-              style="position: relative; width: 68rpx; height: 68rpx"
-            >
-              <u-badge
-                :absolute="true"
-                :offset="[0, -15]"
-                :type="type"
-                max="99"
-                :value="transit"
-              ></u-badge>
-              <image
-                src="/static/express/address.png"
-                style="width: 68rpx; height: 68rpx"
-                mode=""
-              >
-              </image>
-            </view>
-            <text style="margin-top: 16rpx" class="bao">{{
+            " open-type="share" class="u-flex">
+							<image src="../../static/express/share.png" style="width: 36rpx; height: 36rpx" mode="">
+							</image>
+							<text class="friend">{{ i18n.share }}</text>
+						</button>
+						<view class="friend">|</view>
+						<view class="u-flex" @click="counter">
+							<image src="/static/images/index/compile.png" style="width: 36rpx; height: 36rpx" mode="">
+							</image>
+							<text class="friend">{{ i18n.compute }}</text>
+						</view>
+					</view>
+				</view>
+				<!-- 我的包裹 -->
+				<view class="parcel">
+					<view class="u-flex u-row-between">
+						<view class="myparcel">
+							<text>{{ i18n.mine }}</text>
+							<text style="color: rgba(248, 50, 36, 1)">{{ i18n.parcel }}</text>
+						</view>
+						<view class="add u-flex">
+							<image src="../../static/express/add.png" mode="" style="width: 44rpx; height: 44rpx">
+							</image>
+							<text class="addtext" @click="toparcel">{{ i18n.addsign }}</text>
+						</view>
+					</view>
+					<view class="u-flex u-row-around" style="margin-top: 44rpx">
+						<view class="flexc" @click="pack('to_transit')">
+							<view class="" style="position: relative; width: 68rpx; height: 68rpx">
+								<u-badge :absolute="true" :offset="[0, -15]" :type="type" max="99"
+									:value="transit"></u-badge>
+								<image src="/static/express/address.png" style="width: 68rpx; height: 68rpx" mode="">
+								</image>
+							</view>
+							<text style="margin-top: 16rpx" class="bao">{{
               i18n.deliver
             }}</text>
-          </view>
-          <view
-            class="flexc"
-            style="position: relative"
-            @click="pack('transit_receipt')"
-          >
-            <view
-              class=""
-              style="position: relative; width: 68rpx; height: 68rpx"
-            >
-              <u-badge
-                :absolute="true"
-                :offset="[0, -15]"
-                :type="type"
-                max="99"
-                :value="receipt"
-              ></u-badge>
-              <image
-                src="/static/express/sign.png"
-                style="width: 68rpx; height: 68rpx"
-                mode=""
-              ></image>
-            </view>
-            <text style="margin-top: 16rpx" class="bao">{{ i18n.Sign }}</text>
-          </view>
-          <view
-            class="flexc"
-            style="position: relative"
-            @click="pack('to_overseas')"
-          >
-            <view
-              class=""
-              style="position: relative; width: 68rpx; height: 68rpx"
-            >
-              <u-badge
-                :absolute="true"
-                :offset="[0, -15]"
-                :type="type"
-                max="99"
-                :value="overseas"
-              ></u-badge>
-              <image
-                src="../../static/express/send.png"
-                style="width: 68rpx; height: 68rpx"
-                mode=""
-              ></image>
-            </view>
-            <text style="margin-top: 16rpx" class="bao">{{
+						</view>
+						<view class="flexc" style="position: relative" @click="pack('transit_receipt')">
+							<view class="" style="position: relative; width: 68rpx; height: 68rpx">
+								<u-badge :absolute="true" :offset="[0, -15]" :type="type" max="99"
+									:value="receipt"></u-badge>
+								<image src="/static/express/sign.png" style="width: 68rpx; height: 68rpx" mode="">
+								</image>
+							</view>
+							<text style="margin-top: 16rpx" class="bao">{{ i18n.Sign }}</text>
+						</view>
+						<view class="flexc" style="position: relative" @click="pack('to_overseas')">
+							<view class="" style="position: relative; width: 68rpx; height: 68rpx">
+								<u-badge :absolute="true" :offset="[0, -15]" :type="type" max="99"
+									:value="overseas"></u-badge>
+								<image src="../../static/express/send.png" style="width: 68rpx; height: 68rpx" mode="">
+								</image>
+							</view>
+							<text style="margin-top: 16rpx" class="bao">{{
               i18n.overseas
             }}</text>
-          </view>
-        </view>
-      </view>
-      <!-- 拼包 -->
-      <view
-        class="u-flex u-row-between"
-        style="margin-top: 32rpx; width: 702rpx"
-      >
-        <view class="u-flex">
-          <text class="hai">{{ i18n.parceling }}</text>
-          <image
-            v-if="language == 'zh-CN'"
-            style="width: 180rpx; height: 32rpx"
-            src="/static/express/label.png"
-            mode=""
-          ></image>
-          <image
-            v-if="language == 'en-US'"
-            style="width: 300rpx; height: 32rpx"
-            src="/static/express/label1.png"
-            mode=""
-          ></image>
-          <image
-            v-if="language == 'es-ES'"
-            style="width: 334rpx; height: 32rpx"
-            src="/static/express/label2.png"
-            mode=""
-          ></image>
-          <image
-            v-if="language == 'it-IT'"
-            style="width: 366rpx; height: 32rpx"
-            src="/static/express/label3.png"
-            mode=""
-          ></image>
-        </view>
-        <view class="u-flex">
-          <text class="more" @click="more">{{ i18n.more }}</text>
-          <image
-            src="../../static/express/next2.png"
-            style="width: 30rpx; height: 30rpx"
-            mode=""
-          ></image>
-        </view>
-      </view>
-      <!-- 拼包数据 -->
-      <view class="label" v-for="(item, idx) in expressList" :key="idx">
-        <view class="" style="display: flex">
-          <view class="left flexc">
-            <text class="bourn">{{ i18n.destination }}</text>
-            <view class="addres">{{ item.containerBase.country_name }}</view>
-            <view class="addres">{{ item.containerBase.province_name }}</view>
-          </view>
-          <view class="" style="flex: 1; margin-left: 20rpx">
-            <view class="u-flex u-row-between">
-              <view class="">
-                <text class="bigtitle" v-if="item.type == 'normal'">{{
+						</view>
+					</view>
+				</view>
+				<!-- 拼包 -->
+				<view class="u-flex u-row-between" style="margin-top: 32rpx; width: 702rpx">
+					<view class="u-flex">
+						<text class="hai">{{ i18n.parceling }}</text>
+						<image v-if="language == 'zh-CN'" style="width: 180rpx; height: 32rpx"
+							src="/static/express/label.png" mode=""></image>
+						<image v-if="language == 'en-US'" style="width: 300rpx; height: 32rpx"
+							src="/static/express/label1.png" mode=""></image>
+						<image v-if="language == 'es-ES'" style="width: 334rpx; height: 32rpx"
+							src="/static/express/label2.png" mode=""></image>
+						<image v-if="language == 'it-IT'" style="width: 366rpx; height: 32rpx"
+							src="/static/express/label3.png" mode=""></image>
+					</view>
+					<view class="u-flex">
+						<text class="more" @click="more">{{ i18n.more }}</text>
+						<image src="../../static/express/next2.png" style="width: 30rpx; height: 30rpx" mode=""></image>
+					</view>
+				</view>
+				<!-- 拼包数据 -->
+				<view class="label" v-for="(item, idx) in expressList" :key="idx">
+					<view class="" style="display: flex">
+						<view class="left flexc">
+							<text class="bourn">{{ i18n.destination }}</text>
+							<view class="addres">{{ item.containerBase.country_name }}</view>
+							<view class="addres">{{ item.containerBase.province_name }}</view>
+						</view>
+						<view class="" style="flex: 1; margin-left: 20rpx">
+							<view class="u-flex u-row-between">
+								<view class="">
+									<text class="bigtitle" v-if="item.type == 'normal'">{{
                   i18n.Ordinary
                 }}</text>
-                <text class="bigtitle" v-else>{{ i18n.Special }}</text>
-                <text style="margin: 0 8rpx">|</text>
-                <text v-if="language == 'zh-CN'" class="bigtitle">{{
+									<text class="bigtitle" v-else>{{ i18n.Special }}</text>
+									<text style="margin: 0 8rpx">|</text>
+									<text v-if="language == 'zh-CN'" class="bigtitle">{{
                   item.transportType.name_cn
                 }}</text>
-                <text v-if="language == 'en-US'" class="bigtitle">{{
+									<text v-if="language == 'en-US'" class="bigtitle">{{
                   item.transportType.name_en
                 }}</text>
-                <text v-if="language == 'es-ES'" class="bigtitle">{{
+									<text v-if="language == 'es-ES'" class="bigtitle">{{
                   item.transportType.name_es
                 }}</text>
-                <text v-if="language == 'it-IT'" class="bigtitle">{{
+									<text v-if="language == 'it-IT'" class="bigtitle">{{
                   item.transportType.name_ita
                 }}</text>
-              </view>
-              <view class="mon">
-                <text class="timeb">{{ i18n.price }}</text>
-                <text>¥</text>
-                <text v-if="item.price" style="font-size: 32rpx">{{
+								</view>
+								<view class="mon">
+									<text class="timeb">{{ i18n.price }}</text>
+									<text>¥</text>
+									<text v-if="item.price" style="font-size: 32rpx">{{
                   item.price.slice(0, -3)
                 }}</text>
-                <text v-if="item.price">{{ item.price.slice(-3) }}</text>
-              </view>
-            </view>
-            <view class="" style="margin-top: 34rpx">
-              <u-line-progress
-                activeColor="rgba(255, 21, 21, 1)"
-                :percentage="item.progress"
-                height="6"
-                :showText="false"
-              ></u-line-progress>
-            </view>
-            <view class="u-flex u-row-between" style="margin-top: 20rpx">
-              <view class="u-flex">
-                <view class="">
-                  <text class="timeb">{{ i18n.already }} </text>
-                  <text class="timeb" style="color: rgba(255, 21, 21, 1)"
-                    >{{ item.used_weight }}kg</text
-                  >
-                </view>
-                <text style="margin: 0 8rpx">|</text>
-                <view class="">
-                  <text class="timeb">{{ i18n.residue }} </text>
-                  <text class="timeb" style="color: rgba(255, 21, 21, 1)"
-                    >{{ item.residual_weight }}kg</text
-                  >
-                </view>
-              </view>
-              <view class="">
-                <text class="timeb">{{ i18n.plan }}{{ item.progress }}%</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="u-flex u-row-between" style="margin-top: 32rpx">
-          <text class="timea"
-            >{{ i18n.start }}:{{ item.begin_date }}/{{ i18n.cut }}:{{
+									<text v-if="item.price">{{ item.price.slice(-3) }}</text>
+								</view>
+							</view>
+							<view class="" style="margin-top: 34rpx">
+								<u-line-progress activeColor="rgba(255, 21, 21, 1)" :percentage="item.progress"
+									height="6" :showText="false"></u-line-progress>
+							</view>
+							<view class="u-flex u-row-between" style="margin-top: 20rpx">
+								<view class="u-flex">
+									<view class="">
+										<text class="timeb">{{ i18n.already }} </text>
+										<text class="timeb"
+											style="color: rgba(255, 21, 21, 1)">{{ item.used_weight }}kg</text>
+									</view>
+									<text style="margin: 0 8rpx">|</text>
+									<view class="">
+										<text class="timeb">{{ i18n.residue }} </text>
+										<text class="timeb"
+											style="color: rgba(255, 21, 21, 1)">{{ item.residual_weight }}kg</text>
+									</view>
+								</view>
+								<view class="">
+									<text class="timeb">{{ i18n.plan }}{{ item.progress }}%</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="u-flex u-row-between" style="margin-top: 32rpx">
+						<text class="timea">{{ i18n.start }}:{{ item.begin_date }}/{{ i18n.cut }}:{{
               item.end_date
-            }}</text
-          >
-          <view class="pinb" @click="toaccount(item)">{{
+            }}</text>
+						<view class="pinb" @click="toaccount(item)">{{
             i18n.goparceling
           }}</view>
-        </view>
-      </view>
-    </view>
-    <u-popup round="28" :show="logshow" @close="close">
-      <view class="pop">
-        <kj-flow
-          :language="language"
-          :goodstype="goodinfo.goodtype"
-          ref="child"
-          :province_id="province_id"
-          @success="success"
-          @close="close()"
-          :leftchangea="leftchange"
-          :rightchangea="rightchange"
-          :typeida="typeid"
-		  :country_id='country_id'
-        ></kj-flow>
-      </view>
-    </u-popup>
-    <!-- <u-button @click="show = true">打开</u-button> -->
-    <!-- <view class="" style="height: 160rpx;"></view> -->
-  </scroll-view>
+					</view>
+				</view>
+			</view>
+
+			<!-- <u-button @click="show = true">打开</u-button> -->
+			<!-- <view class="" style="height: 160rpx;"></view> -->
+		</scroll-view>
+		<u-popup round="28" :show="logshow" @close="close">
+			<view class="pop">
+				<kj-flow :weight='goodinfo.weight' :length='goodinfo.length' :width=' goodinfo.width'
+					:height='goodinfo.height' :language="language" :goodstype="goodinfo.goodtype" ref="child"
+					:province_id="province_id" @success="success" @close="close()" :leftchangea="leftchange"
+					:rightchangea="rightchange" :typeida="typeid" :country_id='country_id'></kj-flow>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script>
-import { conn } from "@/utils/WebIM";
-export default {
-	props:{
-		language:''
-	},
-  data() {
-    return {
-      //顶部分段器
-      list: [],
-      current: 0,
-      type: "error",
-      percentage: 50, //进度条
-      logshow: false, //物流选择
-      status_collection: "", //我的包裹选择值
-      transit: 0, //发往中转点
-      receipt: 0, //中转已签收
-      overseas: 0, //正发往海外
-      topadd: {}, //新建寄件人
-      bottomadd: {}, //新建收件人
-      province_id: "",
-	  country_id:'',
-      leftname: "",
-      rightname: "",
-      container_id: "", //货柜列表
-      // language: "zh-CN",
-      goodinfo: {}, //物品信息
-      unit_price: "",
-      expressList: [],
-      leftchange: "",
-      rightchange: "",
-      typeid: "",
-      unReadCount: 0,
-    };
-  },
-  created(options) {
-    this.list = [this.i18n.border, this.i18n.shop];
-    // if (options.current) {
-    // 	this.current = options.current
-    // }
-    this.topadd = {}; //新建寄件人
-    this.bottomadd = {}; //新建收件人
-  },
-  mounted() {
-    this.list[0] = this.i18n.border;
-    this.list[1] = this.i18n.shop;
-    // uni.setNavigationBarTitle({
-    // 	title: this.i18n.setup
-    // })
-    this.express(); //获取包裹数量
-    // if (uni.getStorageSync("language") != "") {
-    //   this.language = uni.getStorageSync("language");
-    // }
-    this.getexpress();
-    this.getlist();
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  methods: {
-    getlist() {
-      this.unReadCount = 0;
-      conn
-        .getServerConversations({
-          pageSize: 50,
-          cursor: "",
-        })
-        .then((res) => {
-          console.log(res);
-          res.data.conversations.forEach((item) => {
-            this.unReadCount += item.unReadCount;
-          });
-        });
-    },
-    onShareAppMessage(res) {
-      if (res.from === "button") {
-        // 来自页面内分享按钮
-        console.log(res.target);
-      }
-      return {
-        title: this.i18n.border,
-        path: "/pages/express/express",
-      };
-    },
-    callphone() {
-      uni.$u.http
-        .get("/api/config", {
-          params: {
-            module: "basic",
-          },
-        })
-        .then((res) => {
-          console.log(res);
+	import {
+		conn
+	} from "@/utils/WebIM";
+	export default {
+		props: {
+			language: ''
+		},
+		data() {
+			return {
+				//顶部分段器
+				list: [],
+				current: 0,
+				type: "error",
+				percentage: 50, //进度条
+				logshow: false, //物流选择
+				status_collection: "", //我的包裹选择值
+				transit: 0, //发往中转点
+				receipt: 0, //中转已签收
+				overseas: 0, //正发往海外
+				topadd: {}, //新建寄件人
+				bottomadd: {}, //新建收件人
+				province_id: "",
+				country_id: '',
+				leftname: "",
+				rightname: "",
+				container_id: "", //货柜列表
+				// language: "zh-CN",
+				goodinfo: {}, //物品信息
+				unit_price: "",
+				expressList: [],
+				leftchange: "",
+				rightchange: "",
+				typeid: "",
+				unReadCount: 0,
+			};
+		},
+		created(options) {
+			this.list = [this.i18n.border, this.i18n.shop];
+			// if (options.current) {
+			// 	this.current = options.current
+			// }
+			this.topadd = {}; //新建寄件人
+			this.bottomadd = {}; //新建收件人
+		},
+		mounted() {
+			this.list[0] = this.i18n.border;
+			this.list[1] = this.i18n.shop;
+			// uni.setNavigationBarTitle({
+			// 	title: this.i18n.setup
+			// })
+			// this.express(); //获取包裹数量  
+			// if (uni.getStorageSync("language") != "") {
+			//   this.language = uni.getStorageSync("language");
+			// }
+			// this.getexpress();
+			// this.getlist();
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		methods: {
+			getlist() {
+				this.unReadCount = 0;
+				conn
+					.getServerConversations({
+						pageSize: 50,
+						cursor: "",
+					})
+					.then((res) => {
+						console.log(res);
+						res.data.conversations.forEach((item) => {
+							this.unReadCount += item.unReadCount;
+						});
+					});
+			},
+			onShareAppMessage(res) {
+				if (res.from === "button") {
+					// 来自页面内分享按钮
+					console.log(res.target);
+				}
+				return {
+					title: this.i18n.border,
+					path: "/pages/index/index?current=0",
+				};
+			},
+			callphone() {
+				uni.$u.http
+					.get("/api/config", {
+						params: {
+							module: "basic",
+						},
+					})
+					.then((res) => {
+						console.log(res);
 
-          uni.makePhoneCall({
-            phoneNumber: res.service_mobile,
-          });
-        })
-        .catch(() => {});
-    },
-    //价格计算
-    calculate() {
-      uni.$u.http
-        .get("/api/express-order/calculate", {
-          params: {
-            container_id: this.container_id, // 是 String 货柜ID
-            weight: this.goodinfo.weight, //是 String 重量(kg)
-            length: this.goodinfo.length, //是 String 长(m)
-            width: this.goodinfo.width, //是 String 宽(m)
-            height: this.goodinfo.height, //是 String 高(m)
-            type: this.goodinfo.goodtype, //是 String 商品类型: normal.普通商品,
-          },
-        })
-        .then((res) => {
-          console.log(res);
-          uni.navigateTo({
-            url:
-              "/pageB/delivery?goodinfo=" +
-              encodeURIComponent(JSON.stringify(this.goodinfo)) +
-              "&topadd=" +
-              encodeURIComponent(JSON.stringify(this.topadd)) +
-              "&bottom=" +
-              encodeURIComponent(JSON.stringify(this.bottomadd)) +
-              "&leftname=" +
-              this.leftname +
-              "&rightname=" +
-              this.rightname +
-              "&container_id=" +
-              this.container_id +
-              "&unit_price=" +
-              this.unit_price +
-              "&all=" +
-              res,
-          });
-        })
-        .catch(() => {});
-    },
-    //拼包列表
-    getexpress() {
-      uni.$u.http
-        .get("/api/express-group-package", {
-          params: {
-            is_page: 0,
-            page: 1,
-            limit: 3,
-            transport_type_id: "",
-            container_base_id: "",
-            type: "",
-          },
-        })
-        .then((res) => {
-          this.expressList = res;
-        })
-        .catch(() => {});
-    },
-    //跨境物流选择
-    success(msg) {
-      this.logshow = false;
-      this.leftname = msg.leftname;
-      this.container_id = msg.dateid;
-      this.rightname = msg.rightname;
-      this.unit_price = msg.unit_price;
-      this.leftchange = msg.leftchange;
-      this.rightchange = msg.rightchange;
-      this.typeid = msg.typeid;
-    },
-    //物流选择
-    changewu() {
-      var that = this;
-      if (this.province_id) {
-        this.logshow = true;
-        setTimeout(() => {
-          console.log("2222222", this.$refs.child);
-          that.$refs.child.transport();
-        }, 800);
-      } else {
-        this.$u.toast(this.i18n.selectcity);
-      }
-    },
-    //改变地址
-    changeadd() {
-      var a = {};
-      a = this.topadd;
-      this.topadd = this.bottomadd;
-      this.bottomadd = a;
-      this.province_id = this.bottomadd.province_id;
-      this.country_id = this.bottomadd.country_id;
-    },
-    //正则匹配手机号
-    replacePhoneToStar: function (phone) {
-      if (phone) {
-        return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
-      }
-    },
-    //地址薄
-    addbook(index) {
-      var that = this;
-      uni.navigateTo({
-        url: "/pageC/addressManagement/addressManagement?tabs=" + index,
-        events: {
-          getadd(res) {
-            if (index == 1) {
-              that.topadd = res;
-              console.log("topadd", that.topadd);
-            } else {
-              that.bottomadd = res;
-              console.log("bottom", that.bottomadd);
-              that.province_id = that.bottomadd.province_id;
-              that.country_id = that.bottomadd.country_id;
-            }
-          },
-        },
-      });
-    },
-    //我的包裹
-    express() {
-      uni.$u.http
-        .get("/api/express-order/status-count", {})
-        .then((res) => {
-          console.log(res);
-          this.overseas = res.to_overseas;
-          this.receipt = res.transit_receipt;
-          this.transit = res.to_transit;
-        })
-        .catch(() => {});
-    },
-    todev() {
-      if (JSON.stringify(this.topadd) === "{}") {
-        this.$u.toast("请填写寄件人地址");
-      } else if (JSON.stringify(this.bottomadd) === "{}") {
-        this.$u.toast("请填写收件人地址");
-      } else if (JSON.stringify(this.goodinfo) === "{}") {
-        this.$u.toast("请填写物品信息");
-      } else if (this.leftname == "") {
-        this.$u.toast("请选择物流方式");
-      } else {
-        this.calculate();
-      }
-    },
-    count() {
-      uni.navigateTo({
-        url: "/pageB/account",
-      });
-    },
-    pack(index) {
-      uni.navigateTo({
-        // url: '/pageB/myPackage?index=' + index
-        url: "/pageC/myPackage/myPackage?type=" + index,
-      });
-    },
-    more() {
-      uni.navigateTo({
-        url: "/pageB/list/list",
-      });
-    },
-    //拼包快递
-    toaccount(info) {
-      uni.navigateTo({
-        url:
-          "/pageB/ParcelExpress?expressinfo=" +
-          encodeURIComponent(JSON.stringify(info)) +
-          "&type=" +
-          "pin",
-      });
-    },
-    //物流计算器
-    counter() {
-      uni.navigateTo({
-        url: "/pageA/counter",
-      });
-    },
-    //消息
-    tochat() {
-      uni.navigateTo({
-        url: "/pageA/chat/news",
-      });
-    },
-    //物品信息
-    goods() {
-      var that = this;
-      if (JSON.stringify(this.goodinfo) == "{}") {
-        uni.navigateTo({
-          url: "/pageB/goods",
-          events: {
-            goodinfo: function (res) {
-              console.log("goodinfo", res);
-              that.goodinfo = res;
-            },
-          },
-        });
-      } else {
-        uni.navigateTo({
-          url:
-            "/pageB/goods?goodinfo=" +
-            encodeURIComponent(JSON.stringify(this.goodinfo)),
-          events: {
-            goodinfo: function (res) {
-              that.goodinfo = res;
-              console.log(res);
-            },
-          },
-        });
-      }
-    },
-    //寄件人信息
-    send() {
-      var that = this;
-      if (JSON.stringify(that.topadd) == "{}") {
-        uni.navigateTo({
-          url: "/pageC/addEditAddress/addEditAddress",
-          events: {
-            topadd: function (res) {
-              // console.log(res);
-              that.topadd = res;
-            },
-          },
-        });
-      } else {
-        var that = this;
-        uni.navigateTo({
-          url: "/pageC/addEditAddress/addEditAddress?id=" + that.topadd.id,
-          events: {
-            topadd: function (res) {
-              // console.log(res);
-              that.topadd = res;
-            },
-          },
-        });
-      }
-    },
-    recipirnt() {
-      var that = this;
-      if (JSON.stringify(that.bottomadd) == "{}") {
-        uni.navigateTo({
-          url: "/pageB/recipientinfo",
-          events: {
-            bottomadd: function (res) {
-              console.log(res);
-              that.bottomadd = res;
-              that.province_id = res.province_id;
-              that.country_id = res.country_id;
-            },
-          },
-        });
-      } else {
-        uni.navigateTo({
-          url: "/pageB/recipientinfo?id=" + that.bottomadd.id,
-          events: {
-            bottomadd: function (res) {
-              console.log(res);
-              that.bottomadd = res;
-              that.province_id = res.province_id;
-              that.country_id = res.country_id;
-            },
-          },
-        });
-      }
-    },
-    close() {
-      this.logshow = false;
-    },
-    //分段器切换
-    sectionChange(index) {
-      this.current = index;
-      console.log(index);
-      if (this.current == 1) {
-        uni.switchTab({
-          url: "/pages/index/index?current=1",
-        });
-        this.current = 0;
-      }
-    },
-    toparcel() {
-      uni.navigateTo({
-        url: "/pageB/parcel",
-      });
-    },
-  },
-};
+						uni.makePhoneCall({
+							phoneNumber: res.service_mobile,
+						});
+					})
+					.catch(() => {});
+			},
+			//价格计算
+			calculate() {
+				uni.$u.http
+					.get("/api/express-order/calculate", {
+						params: {
+							container_id: this.container_id, // 是 String 货柜ID
+							weight: this.goodinfo.weight, //是 String 重量(kg)
+							length: this.goodinfo.length, //是 String 长(m)
+							width: this.goodinfo.width, //是 String 宽(m)
+							height: this.goodinfo.height, //是 String 高(m)
+							type: this.goodinfo.goodtype, //是 String 商品类型: normal.普通商品,
+						},
+					})
+					.then((res) => {
+						console.log(res);
+						uni.navigateTo({
+							url: "/pageB/delivery?goodinfo=" +
+								encodeURIComponent(JSON.stringify(this.goodinfo)) +
+								"&topadd=" +
+								encodeURIComponent(JSON.stringify(this.topadd)) +
+								"&bottom=" +
+								encodeURIComponent(JSON.stringify(this.bottomadd)) +
+								"&leftname=" +
+								this.leftname +
+								"&rightname=" +
+								this.rightname +
+								"&container_id=" +
+								this.container_id +
+								"&unit_price=" +
+								this.unit_price +
+								"&all=" +
+								res,
+						});
+					})
+					.catch(() => {});
+			},
+			//拼包列表
+			getexpress() {
+				uni.$u.http
+					.get("/api/express-group-package", {
+						params: {
+							is_page: 0,
+							page: 1,
+							limit: 3,
+							transport_type_id: "",
+							container_base_id: "",
+							type: "",
+						},
+					})
+					.then((res) => {
+						this.expressList = res;
+					})
+					.catch(() => {});
+			},
+			//跨境物流选择
+			success(msg) {
+				this.logshow = false;
+				this.leftname = msg.leftname;
+				this.container_id = msg.dateid;
+				this.rightname = msg.rightname;
+				this.unit_price = msg.unit_price;
+				this.leftchange = msg.leftchange;
+				this.rightchange = msg.rightchange;
+				this.typeid = msg.typeid;
+			},
+			//物流选择
+			changewu() {
+				var that = this;
+				if (this.province_id) {
+					this.logshow = true;
+					setTimeout(() => {
+						console.log("2222222", this.$refs.child);
+						that.$refs.child.transport();
+					}, 800);
+				} else {
+					this.$u.toast(this.i18n.selectcity);
+				}
+			},
+			//改变地址
+			changeadd() {
+				var a = {};
+				a = this.topadd;
+				this.topadd = this.bottomadd;
+				this.bottomadd = a;
+				this.province_id = this.bottomadd.province_id;
+				this.country_id = this.bottomadd.country_id;
+			},
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
+				}
+			},
+			//地址薄
+			addbook(index) {
+				var that = this;
+				uni.navigateTo({
+					url: "/pageC/addressManagement/addressManagement?tabs=" + index,
+					events: {
+						getadd(res) {
+							if (index == 1) {
+								that.topadd = res;
+								console.log("topadd", that.topadd);
+							} else {
+								that.bottomadd = res;
+								console.log("bottom", that.bottomadd);
+								that.province_id = that.bottomadd.province_id;
+								that.country_id = that.bottomadd.country_id;
+							}
+						},
+					},
+				});
+			},
+			//我的包裹
+			express() {
+				uni.$u.http
+					.get("/api/express-order/status-count", {})
+					.then((res) => {
+						console.log(res);
+						this.overseas = res.to_overseas;
+						this.receipt = res.transit_receipt;
+						this.transit = res.to_transit;
+					})
+					.catch(() => {});
+			},
+			todev() {
+				if (JSON.stringify(this.topadd) === "{}") {
+					this.$u.toast("请填写寄件人地址");
+				} else if (JSON.stringify(this.bottomadd) === "{}") {
+					this.$u.toast("请填写收件人地址");
+				} else if (JSON.stringify(this.goodinfo) === "{}") {
+					this.$u.toast(this.i18n.select);
+				} else if (this.leftname == "") {
+					this.$u.toast(this.i18n.logisticsMethod);
+				} else {
+					this.calculate();
+				}
+			},
+			count() {
+				uni.navigateTo({
+					url: "/pageB/account",
+				});
+			},
+			pack(index) {
+				uni.navigateTo({
+					// url: '/pageB/myPackage?index=' + index
+					url: "/pageC/myPackage/myPackage?type=" + index,
+				});
+			},
+			more() {
+				uni.navigateTo({
+					url: "/pageB/list/list",
+				});
+			},
+			//拼包快递
+			toaccount(info) {
+				uni.navigateTo({
+					url: "/pageB/ParcelExpress?expressinfo=" +
+						encodeURIComponent(JSON.stringify(info)) +
+						"&type=" +
+						"pin",
+				});
+			},
+			//物流计算器
+			counter() {
+				uni.navigateTo({
+					url: "/pageA/counter",
+				});
+			},
+			//消息
+			tochat() {
+				uni.navigateTo({
+					url: "/pageA/chat/news",
+				});
+			},
+			//物品信息
+			goods() {
+				var that = this;
+				if (JSON.stringify(this.goodinfo) == "{}") {
+					uni.navigateTo({
+						url: "/pageB/goods",
+						events: {
+							goodinfo: function(res) {
+								console.log("goodinfo", res);
+								that.goodinfo = res;
+							},
+						},
+					});
+				} else {
+					uni.navigateTo({
+						url: "/pageB/goods?goodinfo=" +
+							encodeURIComponent(JSON.stringify(this.goodinfo)),
+						events: {
+							goodinfo: function(res) {
+								that.goodinfo = res;
+								console.log(res);
+							},
+						},
+					});
+				}
+			},
+			//寄件人信息
+			send() {
+				var that = this;
+				if (JSON.stringify(that.topadd) == "{}") {
+					uni.navigateTo({
+						url: "/pageC/addEditAddress/addEditAddress",
+						events: {
+							topadd: function(res) {
+								// console.log(res);
+								that.topadd = res;
+							},
+						},
+					});
+				} else {
+					var that = this;
+					uni.navigateTo({
+						url: "/pageC/addEditAddress/addEditAddress?id=" + that.topadd.id,
+						events: {
+							topadd: function(res) {
+								// console.log(res);
+								that.topadd = res;
+							},
+						},
+					});
+				}
+			},
+			recipirnt() {
+				var that = this;
+				if (JSON.stringify(that.bottomadd) == "{}") {
+					uni.navigateTo({
+						url: "/pageB/recipientinfo",
+						events: {
+							bottomadd: function(res) {
+								console.log(res);
+								that.bottomadd = res;
+								that.province_id = res.province_id;
+								that.country_id = res.country_id;
+							},
+						},
+					});
+				} else {
+					uni.navigateTo({
+						url: "/pageB/recipientinfo?id=" + that.bottomadd.id,
+						events: {
+							bottomadd: function(res) {
+								console.log(res);
+								that.bottomadd = res;
+								that.province_id = res.province_id;
+								that.country_id = res.country_id;
+							},
+						},
+					});
+				}
+			},
+			close() {
+				this.logshow = false;
+			},
+			//分段器切换
+			sectionChange(index) {
+				this.current = index;
+				console.log(index);
+				if (this.current == 1) {
+					uni.switchTab({
+						url: "/pages/index/index?current=1",
+					});
+					this.current = 0;
+				}
+			},
+			toparcel() {
+				uni.navigateTo({
+					url: "/pageB/parcel",
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-button {
-  border: 0rpx solid rgba(0, 0, 0, 1) !important;
-}
+	button {
+		border: 0rpx solid rgba(0, 0, 0, 1) !important;
+	}
 
-page {
-  background-color: rgba(0, 0, 0, 0);
-}
+	page {
+		background-color: rgba(0, 0, 0, 0);
+	}
 
-.bao {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #222222;
-  line-height: 36rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.bao {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 36rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.goodname {
-  font-family: SFPro, SFPro;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #222222;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.goodname {
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.topname {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 30rpx;
-  color: #222222;
-  line-height: 42rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.topname {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #222222;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.topaddress {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #777777;
-  line-height: 36rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.topaddress {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #777777;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.pop {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 36rpx;
-  color: #333333;
-  line-height: 50rpx;
-  text-align: left;
-  font-style: normal;
-  padding: 32rpx 28rpx 0 0;
-  box-sizing: border-box;
-}
+	.pop {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #333333;
+		line-height: 50rpx;
+		text-align: left;
+		font-style: normal;
+		padding: 32rpx 28rpx 0 0;
+		box-sizing: border-box;
+	}
 
-.mon {
-  font-family: HarmonyOS_Sans_Medium;
-  font-size: 20rpx;
-  color: #f83224;
-  line-height: 26rpx;
-  text-align: left;
-  font-style: normal;
-  font-weight: 600;
-}
+	.mon {
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 20rpx;
+		color: #f83224;
+		line-height: 26rpx;
+		text-align: left;
+		font-style: normal;
+		font-weight: 600;
+	}
 
-.bigtitle {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 600;
-  font-size: 28rpx;
-  color: #222222;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.bigtitle {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 600;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.timeb {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #666666;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.timeb {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #666666;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.timea {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #555555;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.timea {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #555555;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.pinb {
-  width: 148rpx;
-  height: 64rpx;
-  background: #ff1515;
-  border-radius: 42rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #ffffff;
-  line-height: 64rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.pinb {
+		width: 148rpx;
+		height: 64rpx;
+		background: #ff1515;
+		border-radius: 42rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #ffffff;
+		line-height: 64rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.label {
-  margin-top: 20rpx;
-  width: 702rpx;
-  // height: 288rpx;
-  background: #ffffff;
-  border-radius: 16rpx;
-  padding: 32rpx 20rpx;
-  box-sizing: border-box;
+	.label {
+		margin-top: 20rpx;
+		width: 702rpx;
+		// height: 288rpx;
+		background: #ffffff;
+		border-radius: 16rpx;
+		padding: 32rpx 20rpx;
+		box-sizing: border-box;
 
-  .left {
-    width: 144rpx;
-    height: 144rpx;
-    background: #f5f5f5;
-    border-radius: 8rpx;
+		.left {
+			width: 144rpx;
+			height: 144rpx;
+			background: #f5f5f5;
+			border-radius: 8rpx;
 
-    .bourn {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #222222;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.bourn {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #222222;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .addres {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #222222;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-    }
-  }
-}
+			.addres {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
 
-.flexc {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
+	.flexc {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
 
-.hai {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 600;
-  font-size: 32rpx;
-  color: #222222;
-  line-height: 44rpx;
-  text-align: left;
-  font-style: normal;
-  margin-right: 10rpx;
-}
+	.hai {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 600;
+		font-size: 32rpx;
+		color: #222222;
+		line-height: 44rpx;
+		text-align: left;
+		font-style: normal;
+		margin-right: 10rpx;
+	}
 
-.more {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #f83224;
-  line-height: 34rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.more {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #f83224;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.parcel {
-  width: 702rpx;
-  // height: 260rpx;
-  background: #ffffff;
-  border-radius: 16rpx;
-  margin-top: 20rpx;
-  padding: 24rpx;
-  box-sizing: border-box;
+	.parcel {
+		width: 702rpx;
+		// height: 260rpx;
+		background: #ffffff;
+		border-radius: 16rpx;
+		margin-top: 20rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
 
-  .myparcel {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 600;
-    font-size: 28rpx;
-    color: #222222;
-    line-height: 40rpx;
-    text-align: left;
-    font-style: normal;
-  }
+		.myparcel {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 600;
+			font-size: 28rpx;
+			color: #222222;
+			line-height: 40rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-  .add {
-    // width: 240rpx;
-    height: 48rpx;
-    background: rgba(248, 50, 36, 0.06);
-    border-radius: 24rpx;
+		.add {
+			// width: 240rpx;
+			height: 48rpx;
+			background: rgba(248, 50, 36, 0.06);
+			border-radius: 24rpx;
 
-    .addtext {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 600;
-      font-size: 20rpx;
-      color: #000000;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-    }
-  }
-}
+			.addtext {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 600;
+				font-size: 20rpx;
+				color: #000000;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
 
-.address {
-  width: 702rpx;
-  // height: 776rpx;
-  background: #ffffff;
-  border-radius: 20rpx;
-  padding: 48rpx 24rpx 36rpx;
-  box-sizing: border-box;
-  margin-top: 38rpx;
+	.address {
+		width: 702rpx;
+		// height: 776rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+		padding: 48rpx 24rpx 36rpx;
+		box-sizing: border-box;
+		margin-top: 38rpx;
 
-  .bottom {
-    padding: 0 76rpx;
-    box-sizing: border-box;
-    margin-top: 48rpx;
+		.bottom {
+			padding: 0 76rpx;
+			box-sizing: border-box;
+			margin-top: 48rpx;
 
-    .friend {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #555555;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-      margin-left: 12rpx;
-    }
-  }
+			.friend {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #555555;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 12rpx;
+			}
+		}
 
-  .mail {
-    width: 646rpx;
-    height: 84rpx;
-    background: #f83224;
-    box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
-    border-radius: 44rpx;
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 500;
-    font-size: 32rpx;
-    color: #ffffff;
-    line-height: 84rpx;
-    text-align: center;
-    font-style: normal;
-  }
+		.mail {
+			width: 646rpx;
+			height: 84rpx;
+			background: #f83224;
+			box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+			border-radius: 44rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #ffffff;
+			line-height: 84rpx;
+			text-align: center;
+			font-style: normal;
+		}
 
-  .info {
-    height: 100rpx;
-    border-bottom: 2rpx solid rgba(151, 151, 151, 0.08);
+		.info {
+			height: 100rpx;
+			border-bottom: 2rpx solid rgba(151, 151, 151, 0.08);
 
-    .wupin {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.wupin {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .change {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #666666;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.change {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #666666;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .mast {
-      // width: 62rpx;
-      height: 30rpx;
-      border-radius: 16rpx;
-      border: 1rpx solid #f83224;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #ff1515;
-      line-height: 30rpx;
-      text-align: center;
-      font-style: normal;
-      margin-left: 12rpx;
-      padding: 0 4rpx;
-      box-sizing: border-box;
-    }
-  }
+			.mast {
+				// width: 62rpx;
+				height: 30rpx;
+				border-radius: 16rpx;
+				border: 1rpx solid #f83224;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #ff1515;
+				line-height: 30rpx;
+				text-align: center;
+				font-style: normal;
+				margin-left: 12rpx;
+				padding: 0 4rpx;
+				box-sizing: border-box;
+			}
+		}
 
-  .left {
-    height: 128rpx;
+		.left {
+			height: 128rpx;
 
-    .pople {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 30rpx;
-      color: #222222;
-      line-height: 42rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.pople {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #222222;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .jiadd {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 26rpx;
-      color: #777777;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.jiadd {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #777777;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .right {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 600;
-      font-size: 26rpx;
-      color: #222222;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-      margin-left: 18rpx;
-    }
-  }
-}
+			.right {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 600;
+				font-size: 26rpx;
+				color: #222222;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 18rpx;
+			}
+		}
+	}
 
-// ::v-deep .u-navbar__content.data-v-1194bf80 {
-// 	background-color: rgba(0, 0, 0, 0) !important;
-// }
+	// ::v-deep .u-navbar__content.data-v-1194bf80 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
 
-// ::v-deep .u-status-bar.data-v-13f16680 {
-// 	background-color: rgba(0, 0, 0, 0) !important;
-// }
+	// ::v-deep .u-status-bar.data-v-13f16680 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
 
-::v-deep .u-subsection--button.data-v-b14d3440 {
-  /* padding: 6rpx 34rpx !important; */
-  border-radius: 64rpx !important;
-}
+	::v-deep .u-subsection--button.data-v-b14d3440 {
+		/* padding: 6rpx 34rpx !important; */
+		border-radius: 64rpx !important;
+	}
 
-::v-deep .u-subsection--button__bar.data-v-b14d3440 {
-  border-radius: 32rpx !important;
-}
-</style>
+	::v-deep .u-subsection--button__bar.data-v-b14d3440 {
+		border-radius: 32rpx !important;
+	}
+</style>

+ 28 - 11
components/kj-flow/kj-flow.vue

@@ -56,17 +56,30 @@ 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="" 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>
-		<view class=""></view>
+		<!-- <view class=""></view> -->
 	</view>
 </template>
 
 <script>
 	export default {
 		props: {
+			weight: {
+				typeof: Number
+			},
+			length: {
+				typeof: Number
+			},
+			width: {
+				typeof: Number
+			},
+			height: {
+				typeof: Number
+			},
 			province_id: {
 				typeof: Number
 			},
@@ -107,7 +120,7 @@ color: #666666;">{{item.name_ita}}</view>
 				dateid: '',
 				unit_price: '',
 				// language: 'zh-CN',
-				typeid: ''
+				typeid: '',
 			};
 		},
 		created() {
@@ -131,9 +144,13 @@ color: #666666;">{{item.name_ita}}</view>
 					params: {
 						is_page: 0,
 						province_id: this.province_id,
-						country_id:this.country_id,
+						country_id: this.country_id,
 						transport_type_id: id,
-						type: this.goodstype
+						type: this.goodstype,
+						weight: this.weight,
+						length: this.length,
+						width: this.width,
+						height: this.height,
 					}
 				}).then((res) => {
 					this.containerList = res
@@ -158,10 +175,10 @@ color: #666666;">{{item.name_ita}}</view>
 				})
 			},
 			transport() {
-				uni.$u.http.get('/api/transport-type',{
-					params:{
-						province_id:this.province_id,
-						country_id:this.country_id
+				uni.$u.http.get('/api/transport-type', {
+					params: {
+						province_id: this.province_id,
+						country_id: this.country_id
 					}
 				}).then((res) => {
 					this.transportList = res
@@ -268,9 +285,9 @@ color: #666666;">{{item.name_ita}}</view>
 
 	.bottom {
 		width: 750rpx;
-		height: 166rpx;
+		// height: 166rpx;
 		background: #FFFFFF;
-		padding: 20rpx 24rpx;
+		padding: 20rpx 24rpx 0;
 		box-sizing: border-box;
 	}
 

+ 123 - 0
node_modules/.vue-global-types/vue_3.3_false.d.ts

@@ -0,0 +1,123 @@
+// @ts-nocheck
+export {};
+
+; declare module 'vue' {
+	export interface GlobalComponents { }
+	export interface GlobalDirectives { }
+}
+; declare global {
+	const __VLS_intrinsicElements: __VLS_IntrinsicElements;
+	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
+	const __VLS_unref: typeof import('vue').unref;
+
+	const __VLS_nativeElements = {
+		...{} as SVGElementTagNameMap,
+		...{} as HTMLElementTagNameMap,
+	};
+
+	type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements;
+	type __VLS_Element = import('vue/jsx-runtime').JSX.Element;
+	type __VLS_GlobalComponents = import('vue').GlobalComponents & Pick<typeof import('vue'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;
+	type __VLS_GlobalDirectives = import('vue').GlobalDirectives;
+	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
+	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+	type __VLS_unknownDirective = (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
+	type __VLS_WithComponent<N0 extends string, LocalComponents, N1 extends string, N2 extends string, N3 extends string> =
+		N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
+		N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
+		N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N3] } :
+		N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
+		N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
+		N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
+		{ [K in N0]: unknown }
+	type __VLS_FunctionalComponentProps<T, K> =
+		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
+		: T extends (props: infer P, ...args: any) => any ? P :
+		{};
+	type __VLS_IsFunction<T, K> = K extends keyof T
+		? __VLS_IsAny<T[K]> extends false
+		? unknown extends T[K]
+		? false
+		: true
+		: false
+		: false;
+	// fix https://github.com/vuejs/language-tools/issues/926
+	type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
+	type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
+		? U extends T
+		? never
+		: __VLS_OverloadUnionInner<T, Pick<T, keyof T> & U & ((...args: A) => R)> | ((...args: A) => R)
+		: never;
+	type __VLS_OverloadUnion<T> = Exclude<
+		__VLS_OverloadUnionInner<(() => never) & T>,
+		T extends () => never ? never : () => never
+	>;
+	type __VLS_ConstructorOverloads<T> = __VLS_OverloadUnion<T> extends infer F
+		? F extends (event: infer E, ...args: infer A) => any
+		? { [K in E & string]: (...args: A) => void; }
+		: never
+		: never;
+	type __VLS_NormalizeEmits<T> = __VLS_PrettifyGlobal<
+		__VLS_UnionToIntersection<
+			__VLS_ConstructorOverloads<T> & {
+				[K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never
+			}
+		>
+	>;
+	type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
+	type __VLS_PickFunctionalComponentCtx<T, K> = NonNullable<__VLS_PickNotAny<
+		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
+		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
+	>>;
+	type __VLS_UseTemplateRef<T> = Readonly<import('vue').ShallowRef<T | null>>;
+
+	function __VLS_getVForSourceType(source: number): [number, number, number][];
+	function __VLS_getVForSourceType(source: string): [string, number, number][];
+	function __VLS_getVForSourceType<T extends any[]>(source: T): [
+		item: T[number],
+		key: number,
+		index: number,
+	][];
+	function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
+		item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
+		key: number,
+		index: undefined,
+	][];
+	// #3845
+	function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
+		item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
+		key: number,
+		index: undefined,
+	][];
+	function __VLS_getVForSourceType<T>(source: T): [
+		item: T[keyof T],
+		key: keyof T,
+		index: number,
+	][];
+	// @ts-ignore
+	function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
+	// @ts-ignore
+	function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
+	function __VLS_asFunctionalDirective<T>(dir: T): T extends import('vue').ObjectDirective
+		? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
+		: T extends (...args: any) => any
+			? T
+			: __VLS_unknownDirective;
+	function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
+	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
+	function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
+	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
+		T extends new (...args: any) => any
+		? (props: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>, ctx?: any) => __VLS_Element & { __ctx?: {
+			attrs?: any,
+			slots?: K extends { $slots: infer Slots } ? Slots : any,
+			emit?: K extends { $emit: infer Emit } ? Emit : any
+		} & { props?: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>; expose?(exposed: K): void; } }
+		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
+		: T extends (...args: any) => any ? T
+		: (_: {} & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record<string, unknown> } };
+	function __VLS_elementAsFunction<T>(tag: T, endTag?: T): (_: T & Record<string, unknown>) => void;
+	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
+	function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
+	function __VLS_tryAsConstant<const T>(t: T): T;
+}

+ 1 - 1
pageA/chat/chat.vue

@@ -118,7 +118,7 @@
 							</view>
 						</view>
 					</view>
-					<image v-if="item.from == '13523652365'" src="/pageA/static/images/kefu.png"
+					<image v-if="item.from == '19550568052'" src="/pageA/static/images/kefu.png"
 						style="width: 88rpx;height: 88rpx;" mode=""></image>
 					<image v-else-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 				</view>

+ 3 - 3
pageA/chat/news.vue

@@ -7,7 +7,7 @@
 		</view>
 		<!-- 客服 -->
 		<view class="" v-for="(item,idx) in list" :key="idx">
-			<view v-if="user_no !='13523652365' && item.conversationId == '13523652365'" class="kefu u-flex"
+			<view v-if="user_no !='19550568052' && item.conversationId == '19550568052'" class="kefu u-flex"
 				@click="tokefu">
 				<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
 				<view class="u-row-between"
@@ -34,7 +34,7 @@
 					<u-swipe-action-item :options="options1" @click.stop="dele">
 						<view class="">
 							<view class=""> -->
-				<view class="u-flex " v-if="item.conversationId != '13523652365'">
+				<view class="u-flex " v-if="item.conversationId != '19550568052'">
 					<image v-if="item.lastMessage.ext.user.easemob_username == user_no"
 						:src="item.lastMessage.ext.user_other.image || item.lastMessage.ext.user_other.avatar"
 						style="width: 88rpx;height: 88rpx;" mode="">
@@ -71,7 +71,7 @@
 				</u-swipe-action> -->
 			</view>
 			<!-- 			<view style="margin-bottom: 26rpx;" v-for="(item,idx) in  list" :key="idx" @click="chat(item)">
-				<view class="u-flex " v-if="item.conversationId != '13523652365'">
+				<view class="u-flex " v-if="item.conversationId != '19550568052'">
 					<image :src=" item.lastMessage.ext.user_other.avatar" style="width: 88rpx;height: 88rpx;" mode="">
 					</image>
 					<view class="u-row-between"

+ 3 - 3
pageA/chat/search.vue

@@ -9,7 +9,7 @@
 		<!-- 客服 -->
 <!-- 				<view class="" v-for="(item,idx) in list" :key="idx">
 			<view v-for="(child,index) in item.easemob_log" :key="index">
-				<view v-if="user_no !='13523652365' && item.form_id == '13523652365'" class="kefu u-flex"
+				<view v-if="user_no !='19550568052' && item.form_id == '19550568052'" class="kefu u-flex"
 					@click="tokefu">
 					<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
 					<view class="u-row-between"
@@ -31,7 +31,7 @@
 		<view class="box ">
 			<view style="margin-bottom: 26rpx;" v-for="(item,idx) in  list" :key="idx" >
 				<view v-for="(child,index) in item.easemob_log" :key="index" @click="chat(item,child)">
-					<view v-if="user_no !='13523652365' && item.targetId == '13523652365'" class="kefu u-flex"
+					<view v-if="user_no !='19550568052' && item.targetId == '19550568052'" class="kefu u-flex"
 						@click="tokefu(child)">
 						<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
 						<view class="u-row-between"
@@ -48,7 +48,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="u-flex " v-if="item.targetId != '13523652365'">
+					<view class="u-flex " v-if="item.targetId != '19550568052'">
 						<image v-if="item.form_id == user_no" :src="item.to_merchant.image || item.to_member.avatar"
 							style="width: 88rpx;height: 88rpx;" mode=""> </image>
 						<image v-else :src="item.form_member.avatar" style="width: 88rpx;height: 88rpx;" mode="">

+ 2 - 2
pageA/payorder.vue

@@ -592,7 +592,7 @@ export default {
                   console.log("success:" + JSON.stringify(res));
                   setTimeout(() => {
                     uni.switchTab({
-                      url: "/pages/express/express",
+                      url: "/pages/index/index?current=0",
                     });
                   }, 800);
                 },
@@ -604,7 +604,7 @@ export default {
               this.$u.toast(this.i18n.Paymentsuccess);
               setTimeout(() => {
                 uni.switchTab({
-                  url: "/pages/express/express",
+                  url: "/pages/index/index?current=0",
                 });
               }, 800);
             }

+ 8 - 10
pageA/productdetails.vue

@@ -28,11 +28,11 @@
 			<view class="uni-margin-wrap" id="scroll0">
 				<swiper class="swiper" circular :indicator-dots="false" :autoplay="true">
 					<swiper-item v-if="goodinfo.video">
-						<video style="width: 750rpx; height: 750rpx" :src="goodinfo.video"></video>
+						<video :poster="goodinfo.image" style="width: 100%; height: 100%" :src="goodinfo.video"></video>
 					</swiper-item>
 					<template v-if="goodinfo.images">
 						<swiper-item v-for="(item, idx) in goodinfo.images.split(',')" :key="idx">
-							<image :src="goodinfo.image" style="width: 750rpx; height: 750rpx" mode=""></image>
+							<image :src="item" style="width: 750rpx; height: 750rpx" mode=""></image>
 						</swiper-item>
 					</template>
 				</swiper>
@@ -45,10 +45,8 @@
               i18n.Discounted
             }}</text>
 						<text class="money">¥</text>
-						<text class="money" style="font-size: 48rpx">{{
-              goodinfo.discount_price.slice(0, -3)
-            }}</text>
-						<text class="money">{{ goodinfo.discount_price.slice(-3) }}</text>
+						<text class="money" style="font-size: 48rpx">{{goodinfo.discount_price?goodinfo.discount_price.slice(0, -3):''}}</text>
+						<text class="money">{{ goodinfo.discount_price?goodinfo.discount_price.slice(-3):'' }}</text>
 						<!-- <text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price }}</text> -->
 						<text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price * value }}</text>
 					</view>
@@ -305,7 +303,7 @@
 			<view style="padding: 48rpx 28rpx; box-sizing: border-box; position: relative">
 				<view class="u-flex">
 					<image :src="
-              JSON.stringify(sku_info) == '{}' ? goodinfo.image : sku_info.image
+              sku_info.image==null ? goodinfo.image : sku_info.image
             " style="width: 192rpx; height: 192rpx" mode="">
 					</image>
 					<view class="" style="margin-left: 20rpx">
@@ -906,8 +904,8 @@
 				console.log('this.selectArrindex', this.selectArr[index]);
 				console.log('this.childA', this.childA);
 				this.goodinfo.sku_item.forEach((ite) => {
-					console.log('ite',ite);
-					console.log('this.selectArr.join(",")',this.selectArr.join(","));
+					console.log('ite', ite);
+					console.log('this.selectArr.join(",")', this.selectArr.join(","));
 					var active = ''
 					if (this.language == "en-US") {
 						active = ite.item_en
@@ -931,7 +929,7 @@
 						this.goodinfo.price = this.sku_info.price;
 					}
 				});
-				console.log(this.sku_info);
+				console.log('2222', this.sku_info);
 			},
 			order() {
 				if (JSON.stringify(this.sku_info) != "{}") {

+ 1 - 1
pageA/service/service.vue

@@ -128,7 +128,7 @@
 	export default {
 		data() {
 			return {
-				user_other_no: '13523652365',
+				user_other_no: '19550568052',
 				user_no: '',
 				user: {},
 				user_other: {},

+ 1 - 1
pageA/shoplist.vue

@@ -337,7 +337,7 @@
 	.box {
 		width: 750rpx;
 		min-height: 1360rpx;
-		background: #FFFFFF;
+		// background: #FFFFFF;
 		border-radius: 28rpx 28rpx 0rpx 0rpx;
 		padding: 38rpx 20rpx 20rpx;
 		box-sizing: border-box;

+ 2 - 2
pageB/end.vue

@@ -98,13 +98,13 @@
 				</view>
 			</view>
 			<!-- 快递服务 -->
-			<view class="wup u-flex u-row-between">
+<!-- 			<view class="wup u-flex u-row-between">
 				<view>{{i18n.Expressservice}}</view>
 				<view class="u-flex" @click="toexpress">
 					<view class="selection">{{expname||i18n.selection}}</view>
 					<image src="../static/express/next1.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
 				</view>
-			</view>
+			</view> -->
 			<!-- 下一步 -->
 			<view class="next  u-flex-between" style="display: flex;">
 				<!-- 				<view class="" style="flex: 1;">

+ 24 - 3
pageB/expresstype.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="box">
+		<view class="" style="background: #fff;margin-bottom: 20rpx;">
+			<u--input :placeholder="i18n.logisticsmethod" border="surround" v-model="keyword" @change="change"></u--input>
+		</view>
 		<view class="exp">
 			<u-radio-group v-model="radiovalue1" placement="column" @change="groupChange">
 				<view class="item u-flex u-row-between" v-for="(item,idx) in radiolist1" v-if="idx<page" :key="idx">
@@ -24,7 +27,9 @@
 				concant: '',
 				code: '',
 				radiolist1: [],
-				page: 20
+				page: 20,
+				keyword: '',
+				radiolist: []
 			};
 		},
 		computed: {
@@ -44,10 +49,26 @@
 			}
 		},
 		methods: {
+			change(e) {
+				console.log('change', e);
+				this.radiolist = []
+				if (uni.getStorageSync('radiolist1')) {
+					console.log(uni.getStorageSync('radiolist1'));
+					this.radiolist1 = uni.getStorageSync('radiolist1')
+				}
+				this.radiolist1.forEach(item => {
+					if (item.name.indexOf(e)==-1) {
+
+					} else {
+						this.radiolist.push(item)
+					}
+				})
+				this.radiolist1 = this.radiolist
+				console.log(this.radiolist1);
+			},
 			load(index) {
 				console.log(index)
 			},
-
 			toteach() {
 				const eventChannel = this.getOpenerEventChannel();
 				eventChannel.emit('todcp', {
@@ -104,7 +125,7 @@
 		}
 
 		.exp {
-			width: 702rpx;
+			// width: 702rpx;
 			// height: 564rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;

+ 12 - 3
pageB/orderinfo.vue

@@ -4,7 +4,7 @@
 		</u-navbar>
 		<view class="top u-flex u-row-between">
 			<text class="success">{{i18n.successful}}</text>
-			<text class="sun">{{i18n.pickpackage}}</text>
+			<!-- <text class="sun">{{i18n.pickpackage}}</text> -->
 		</view>
 		<view class="address">
 			<view class="" style="margin-top: 44rpx;">
@@ -51,7 +51,8 @@
 		onLoad(options) {
 			this.orderinfo = JSON.parse(decodeURIComponent(options.orderinfo));
 			console.log(this.orderinfo);
-			this.$u.toast(this.i18n.successful + this.i18n.myPackage + '-' + this.i18n.Vieworder)
+			// this.$u.toast(this.i18n.successful + this.i18n.myPackage + '-' + this.i18n.Vieworder)
+			this.config()
 		},
 		computed: {
 			i18n() {
@@ -61,8 +62,16 @@
 		methods: {
 			leftClick() {
 				uni.switchTab({
-					url: '/pages/express/express'
+					url: '/pages/index/index'
 				})
+			},
+			config(){
+				//获取配置信息
+				  uni.$u.http
+				    .get(`/api/config?module=express`)
+				    .then((res) => {
+				      this.$u.toast(res.prompt)
+				    });
 			}
 		}
 	}

+ 8 - 5
pageB/recipientinfo.vue

@@ -21,11 +21,11 @@
 			<view class="item u-flex ">
 				<text class="left">{{i18n.phone}}</text>
 				<view class="right" style="display: flex;">
-				<!-- 	<input style="width: 100rpx;" type="text" placeholder="(+86)" v-model="phone" />
-					<text style="margin-right: 20rpx;">-</text> -->
+					<input style="width: 100rpx;" type="text" placeholder="(+86)" v-model="phonecode" />
+					<text style="margin-right: 20rpx;">-</text>
 					<input type="text" :placeholder="i18n.pleasePhoneNumber" v-model="phone" />
 				</view>
-			</view>
+			</view>  
 			<view class="item u-flex ">
 				<text class="left">{{i18n.postalCode}}</text>
 				<view class="right">
@@ -104,7 +104,8 @@
 				detailed: "",
 				email:"",
 				companyName: "",
-				is_default: 0
+				is_default: 0,
+				phonecode:''
 			};
 		},  
 		onLoad(options) {
@@ -129,6 +130,7 @@
 					this.addid = res.country_id;
 					this.cityid = res.province_id;
 					this.postalCode = res.zip_code;
+					this.phonecode = res.global_roaming;
 					if(this.is_default==1){
 						this.checkboxValue1 = [1]
 					}else{
@@ -161,7 +163,8 @@
 					company_name: this.companyName,
 					email: this.email,
 					zip_code: this.postalCode,
-					is_default: this.is_default
+					is_default: this.is_default,
+					phonecode:this.phonecode?this.phonecode:'86'
 				};
 				if (this.addressId) {
 					uni.$u.http.put(`/api/address/${this.addressId}`, obj).then((res) => {

+ 4 - 3
pageB/search.vue

@@ -81,9 +81,10 @@ import { vShow } from 'vue';
 			},
 			enter() {
 				console.log(this.record);
-				this.record.push(this.keyword)
-				
-				uni.setStorageSync('record',this.record)
+				if(this.record.indexOf(this.keyword)==-1){
+					this.record.push(this.keyword)
+					uni.setStorageSync('record',this.record)
+				}
 				this.getgoods()
 			},
 			search() {

+ 412 - 408
pageC/addEditAddress/addEditAddress.vue

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

+ 326 - 393
pageC/internationalAddress/internationalAddress.vue

@@ -1,420 +1,353 @@
 <template>
-  <view class="page">
-    <view class="content">
-      <view class="title">
-        <text class="title-left">{{ i18n.contacts }}</text>
-      </view>
-      <!-- 注意,如果需要兼容微信小程序,最好通过setRules方法设置rules规则 -->
-      <u--form labelPosition="left" :model="model1" ref="uForm">
-        <u-form-item
-          labelWidth="150rpx"
-          @click="showDialog = true"
-          :label="i18n.country"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.country"
-            disabled
-            disabledColor="#ffffff"
-            :placeholder="i18n.selection"
-            border="none"
-          ></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-        </u-form-item>
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.name"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.name"
-            :placeholder="i18n.goods"
-            border="none"
-          ></u--input>
-        </u-form-item>
+	<view class="page">
+		<view class="content">
+			<view class="title">
+				<text class="title-left">{{ i18n.contacts }}</text>
+			</view>
+			<!-- 注意,如果需要兼容微信小程序,最好通过setRules方法设置rules规则 -->
+			<u--form labelPosition="left" :model="model1" ref="uForm">
+				<u-form-item labelWidth="150rpx" @click="showDialog = true" :label="i18n.country" borderBottom
+					ref="item1">
+					<u--input v-model="model1.userInfo.country" disabled disabledColor="#ffffff"
+						:placeholder="i18n.selection" border="none"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				<u-form-item labelWidth="150rpx" :label="i18n.name" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.name" :placeholder="i18n.goods" border="none"></u--input>
+				</u-form-item>
+<!-- 
+				<view class="item u-flex ">
+					<text class="left">{{i18n.phone}}</text>
+					<view class="right" style="display: flex;">
+						<input style="width: 100rpx;" type="text" placeholder="(+86)"
+							v-model="model1.userInfo.phonecode" />
+						<text style="margin-right: 20rpx;">-</text>
+						<u--input v-model="model1.userInfo.phone" :placeholder="i18n.pleasePhone"
+							border="none"></u--input>
+					</view>
+				</view> -->
 
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.phone"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.phone"
-            :placeholder="i18n.pleasePhoneNumber"
-            border="none"
-          ></u--input>
-        </u-form-item>
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.postalCode"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.zip_code"
-            :placeholder="i18n.PleacePostalCode"
-            border="none"
-          ></u--input>
-        </u-form-item>
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.city"
-          borderBottom
-          @click="openCity"
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.city"
-            disabled
-            disabledColor="#ffffff"
-            :placeholder="i18n.township"
-            border="none"
-          ></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-        </u-form-item>
 
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.detailed"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.detailed"
-            :placeholder="i18n.sect"
-            border="none"
-          ></u--input>
-        </u-form-item>
+				<u-form-item labelWidth="150rpx" :label="i18n.phone" borderBottom ref="item1">
+<!-- 					<u--input v-model="model1.userInfo.phone" :placeholder="i18n.pleasePhoneNumber"
+						border="none"></u--input> -->
+						<view class="right" style="display: flex;">
+							<input style="width: 100rpx;" type="text" placeholder="(+86)"
+								v-model="model1.userInfo.phonecode" />
+							<!-- <u--input style="width: 100rpx;" v-model="model1.userInfo.phonecode" placeholder="(+86)" border="none"></u--input> -->
+							<text style="margin-right: 20rpx;">-</text>
+							<u--input v-model="model1.userInfo.phone" :placeholder="i18n.pleasePhone"
+								border="none"></u--input>
+						</view>
+				</u-form-item>
+				<u-form-item labelWidth="150rpx" :label="i18n.postalCode" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.zip_code" :placeholder="i18n.PleacePostalCode"
+						border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="150rpx" :label="i18n.city" borderBottom @click="openCity" ref="item1">
+					<u--input v-model="model1.userInfo.city" disabled disabledColor="#ffffff"
+						:placeholder="i18n.township" border="none"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
 
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.companyName"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.companyName"
-            :placeholder="i18n.company"
-            border="none"
-          ></u--input>
-        </u-form-item>
-        <u-form-item
-          labelWidth="150rpx"
-          :label="i18n.email"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="model1.userInfo.email"
-            :placeholder="i18n.pleaseEmail"
-            border="none"
-          ></u--input>
-        </u-form-item>
-        <view
-          style="
+				<u-form-item labelWidth="150rpx" :label="i18n.detailed" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.detailed" :placeholder="i18n.sect" border="none"></u--input>
+				</u-form-item>
+
+				<u-form-item labelWidth="150rpx" :label="i18n.companyName" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.companyName" :placeholder="i18n.company"
+						border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="150rpx" :label="i18n.email" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.email" :placeholder="i18n.pleaseEmail" border="none"></u--input>
+				</u-form-item>
+				<view style="
             display: flex;
             justify-content: space-between;
             align-items: center;
-          "
-        >
-          <view class="item-left">
-            <image
-              src="../../static/mine/330.png"
-              class="address-icon"
-              mode=""
-            ></image>
-            <text>{{ i18n.addressBook }}</text>
-          </view>
-          <text style="font-size: 24rpx; color: #333" @click="empty">{{
+          ">
+					<view class="item-left">
+						<image src="../../static/mine/330.png" class="address-icon" mode=""></image>
+						<text>{{ i18n.addressBook }}</text>
+					</view>
+					<text style="font-size: 24rpx; color: #333" @click="empty">{{
             i18n.empty
           }}</text>
-        </view>
-      </u--form>
-    </view>
-    <!-- <SelectCity :show="show" @close="close" :countryId="country.id" /> -->
-    <view class="footer">
-      <button class="save" @click="submit">{{ i18n.preserve }}</button>
-    </view>
+				</view>
+			</u--form>
+		</view>
+		<!-- <SelectCity :show="show" @close="close" :countryId="country.id" /> -->
+		<view class="footer">
+			<button class="save" @click="submit">{{ i18n.preserve }}</button>
+		</view>
 
-    <u-picker
-      :show="show"
-      :columns="cityList"
-      keyName="name"
-      @confirm="countrycConfirm"
-      @cancel="show = false"
-      :closeOnClickOverlay="true"
-      @close="close"
-    ></u-picker>
-    <u-picker
-      :show="showDialog"
-      :columns="columns"
-      keyName="name"
-      @cancel="showDialog = false"
-      :closeOnClickOverlay="true"
-      @confirm="confirm"
-      @close="close"
-    ></u-picker>
-  </view>
+		<u-picker :show="show" :columns="cityList" keyName="name" @confirm="countrycConfirm" @cancel="show = false"
+			:closeOnClickOverlay="true" @close="close"></u-picker>
+		<u-picker :show="showDialog" :columns="columns" keyName="name" @cancel="showDialog = false"
+			:closeOnClickOverlay="true" @confirm="confirm" @close="close"></u-picker>
+	</view>
 </template>
 
 <script>
-import SelectCity from "../addEditAddress/component/selectCity.vue";
-export default {
-  components: {
-    SelectCity,
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  data() {
-    return {
-      show: false, //城市弹窗
-      showDialog: false, //国家弹窗
-      //表单数据
-      model1: {
-        userInfo: {
-          name: "",
-          phone: "",
-          country: "",
-          postalCode: "",
-          city: "",
-          detailed: "",
-          email: "",
-          companyName: "",
-          zip_code: "",
-        },
-      },
-      selectedCity: {}, //选中的城市
-      columns: [], //获取到的国家数据
-      country: {}, //选中的国家数据
-      cityList: [[]], //选中国家之后的城市数据
-      addressId: "", //编辑的地址id
-      rules: {
-        "userInfo.name": {
-          type: "string",
-          required: true,
-          message: "请填写姓名",
-          trigger: ["blur", "change"],
-        },
-        "userInfo.sex": {
-          type: "string",
-          max: 1,
-          required: true,
-          message: "请选择男或女",
-          trigger: ["blur", "change"],
-        },
-      },
-    };
-  },
-  onLoad(options) {
-    if (options.id) {
-      this.addressId = options.id;
-      this.getAddressDetail(options.id);
-    } else {
-      uni.setNavigationBarTitle({
-        title: this.i18n.newAddress,
-      });
-    }
-  },
-  methods: {
-    //回显数据
-    getAddressDetail(id) {
-      uni.setNavigationBarTitle({
-        title: "编辑地址",
-      });
-      uni.$u.http.get(`/api/address/${id}`).then((res) => {
-        this.model1.userInfo.city = res.province_name;
-        this.model1.userInfo.name = res.name;
-        this.model1.userInfo.phone = res.mobile;
-        this.model1.userInfo.detailed = res.address;
-        this.model1.userInfo.companyName = res.company_name;
-        this.model1.userInfo.is_default = res.is_default;
-        this.model1.userInfo.country = res.country_name;
-        this.model1.userInfo.email = res.email;
-        this.country.id = res.country_id;
-        this.selectedCity.id = res.province_id;
-        this.model1.userInfo.zip_code = res.zip_code;
-      });
-    },
+	import SelectCity from "../addEditAddress/component/selectCity.vue";
+	export default {
+		components: {
+			SelectCity,
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		data() {
+			return {
+				show: false, //城市弹窗
+				showDialog: false, //国家弹窗
+				//表单数据
+				model1: {
+					userInfo: {
+						name: "",
+						phone: "",
+						country: "",
+						postalCode: "",
+						city: "",
+						detailed: "",
+						email: "",
+						companyName: "",
+						zip_code: "",
+					},
+				},
+				selectedCity: {}, //选中的城市
+				columns: [], //获取到的国家数据
+				country: {}, //选中的国家数据
+				cityList: [
+					[]
+				], //选中国家之后的城市数据
+				addressId: "", //编辑的地址id
+				rules: {
+					"userInfo.name": {
+						type: "string",
+						required: true,
+						message: "请填写姓名",
+						trigger: ["blur", "change"],
+					},
+					"userInfo.sex": {
+						type: "string",
+						max: 1,
+						required: true,
+						message: "请选择男或女",
+						trigger: ["blur", "change"],
+					},
+				},
+			};
+		},
+		onLoad(options) {
+			if (options.id) {
+				this.addressId = options.id;
+				this.getAddressDetail(options.id);
+			} else {
+				uni.setNavigationBarTitle({
+					title: this.i18n.newAddress,
+				});
+			}
+		},
+		methods: {
+			//回显数据
+			getAddressDetail(id) {
+				uni.setNavigationBarTitle({
+					title: "编辑地址",
+				});
+				uni.$u.http.get(`/api/address/${id}`).then((res) => {
+					this.model1.userInfo.city = res.province_name;
+					this.model1.userInfo.name = res.name;
+					this.model1.userInfo.phone = res.mobile;
+					this.model1.userInfo.detailed = res.address;
+					this.model1.userInfo.companyName = res.company_name;
+					this.model1.userInfo.is_default = res.is_default;
+					this.model1.userInfo.country = res.country_name;
+					this.model1.userInfo.email = res.email;
+					this.country.id = res.country_id;
+					this.selectedCity.id = res.province_id;
+					this.model1.userInfo.zip_code = res.zip_code;
+					this.model1.userInfo.phonecode = res.global_roaming;
+				});
+			},
 
-    //清空输入
-    empty() {
-      this.model1.userInfo = {
-        name: "",
-        phone: "",
-        country: "",
-        postalCode: "",
-        city: "",
-        detailed: "",
-        email: "",
-        companyName: "",
-        zip_code: "",
-      };
-    },
-    //选择国家
-    confirm(e) {
-      this.country = e.value[0];
-      this.model1.userInfo.country = this.country.name;
-      this.getCityList(this.country.id);
-      this.showDialog = false;
-    },
-    //打开选择城市的弹窗
-    openCity() {
-      //判断是否选择国家
-      if (JSON.stringify(this.country) != "{}") {
-        //判断选中的国家有没有城市数据
-        if (this.cityList[0].length > 0) {
-          this.show = true;
-        } else {
-          uni.$u.toast("该国家没有城市数据,请直接填写详细地址");
-        }
-      } else {
-        uni.$u.toast("请先选择国家");
-      }
-    },
-    //选择国家
-    countrycConfirm(e) {
-      this.selectedCity = e.value[0];
-      this.model1.userInfo.city = this.selectedCity.name;
-      this.show = false;
-    },
-    submit() {
-      const obj = {
-        mobile: this.model1.userInfo.phone,
-        name: this.model1.userInfo.name,
-        country_id: this.country.id,
-        province_id: this.selectedCity.id,
-        address: this.model1.userInfo.detailed,
-        company_name: this.model1.userInfo.companyName,
-        email: this.model1.userInfo.email,
-        zip_code: this.model1.userInfo.zip_code,
-      };
-      if (this.addressId) {
-        uni.$u.http.put(`/api/address/${this.addressId}`, obj).then((res) => {
-          uni.navigateBack({
-            delta: 1,
-          });
-        });
-      } else {
-        uni.$u.http.post(`/api/address`, obj).then((res) => {
-          uni.navigateBack({
-            delta: 1,
-          });
-        });
-      }
-    },
-    //关闭弹窗
-    close() {
-      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) => {
-        this.cityList = [res];
-      });
-    },
-  },
-  mounted() {
-    this.getCountryList();
-  },
-  onReady() {
-    //如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则。
-    this.$refs.uForm.setRules(this.rules);
-  },
-};
+			//清空输入
+			empty() {
+				this.model1.userInfo = {
+					name: "",
+					phone: "",
+					country: "",
+					postalCode: "",
+					city: "",
+					detailed: "",
+					email: "",
+					companyName: "",
+					zip_code: "",
+					phonecode:'',
+				};
+			},
+			//选择国家
+			confirm(e) {
+				this.country = e.value[0];
+				this.model1.userInfo.country = this.country.name;
+				this.getCityList(this.country.id);
+				this.showDialog = false;
+			},
+			//打开选择城市的弹窗
+			openCity() {
+				//判断是否选择国家
+				if (JSON.stringify(this.country) != "{}") {
+					//判断选中的国家有没有城市数据
+					if (this.cityList[0].length > 0) {
+						this.show = true;
+					} else {
+						uni.$u.toast("该国家没有城市数据,请直接填写详细地址");
+					}
+				} else {
+					uni.$u.toast("请先选择国家");
+				}
+			},
+			//选择国家
+			countrycConfirm(e) {
+				this.selectedCity = e.value[0];
+				this.model1.userInfo.city = this.selectedCity.name;
+				this.show = false;
+			},
+			submit() {
+				const obj = {
+					mobile: this.model1.userInfo.phone,
+					name: this.model1.userInfo.name,
+					country_id: this.country.id,
+					province_id: this.selectedCity.id,
+					address: this.model1.userInfo.detailed,
+					company_name: this.model1.userInfo.companyName,
+					email: this.model1.userInfo.email,
+					zip_code: this.model1.userInfo.zip_code,
+					global_roaming: this.model1.userInfo.phonecode,
+				};
+				if (this.addressId) {
+					uni.$u.http.put(`/api/address/${this.addressId}`, obj).then((res) => {
+						uni.navigateBack({
+							delta: 1,
+						});
+					});
+				} else {
+					uni.$u.http.post(`/api/address`, obj).then((res) => {
+						uni.navigateBack({
+							delta: 1,
+						});
+					});
+				}
+			},
+			//关闭弹窗
+			close() {
+				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) => {
+					this.cityList = [res];
+				});
+			},
+		},
+		mounted() {
+			this.getCountryList();
+		},
+		onReady() {
+			//如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则。
+			this.$refs.uForm.setRules(this.rules);
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.page {
-  padding: 20rpx 24rpx;
+	.page {
+		padding: 20rpx 24rpx;
 
-  .content {
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 0 24rpx;
+		.content {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 24rpx;
 
-    .title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      height: 100rpx;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+			.title {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 100rpx;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
 
-      .title-left {
-        font-size: 32rpx;
-        color: #333;
-        font-weight: 600;
-      }
+				.title-left {
+					font-size: 32rpx;
+					color: #333;
+					font-weight: 600;
+				}
 
-      .title-icon {
-        width: 26rpx;
-        height: 26rpx;
-        margin-right: 10rpx;
-      }
+				.title-icon {
+					width: 26rpx;
+					height: 26rpx;
+					margin-right: 10rpx;
+				}
 
-      .title-right {
-        display: flex;
-        align-items: center;
-        font-size: 24rpx;
-        color: rgba(51, 51, 51, 0.6);
-      }
-    }
+				.title-right {
+					display: flex;
+					align-items: center;
+					font-size: 24rpx;
+					color: rgba(51, 51, 51, 0.6);
+				}
+			}
 
-    .company {
-      height: 102rpx;
-      display: flex;
-      align-items: center;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-    }
-  }
+			.company {
+				height: 102rpx;
+				display: flex;
+				align-items: center;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+			}
+		}
 
-  .item-left {
-    font-size: 24rpx;
-    color: #333;
-    display: flex;
-    align-items: center;
-    height: 86rpx;
+		.item-left {
+			font-size: 24rpx;
+			color: #333;
+			display: flex;
+			align-items: center;
+			height: 86rpx;
 
-    .address-icon {
-      width: 26rpx;
-      height: 26rpx;
-      margin-right: 10rpx;
-    }
-  }
+			.address-icon {
+				width: 26rpx;
+				height: 26rpx;
+				margin-right: 10rpx;
+			}
+		}
 
-  .footer {
-    background-color: #fff;
-    position: fixed;
-    bottom: 0;
-    height: 146rpx;
-    width: 750rpx;
-    left: 0;
-    padding-top: 20rpx;
+		.footer {
+			background-color: #fff;
+			position: fixed;
+			bottom: 0;
+			height: 146rpx;
+			width: 750rpx;
+			left: 0;
+			padding-top: 20rpx;
 
-    .save {
-      width: 702rpx;
-      margin: 0 auto;
-      background-color: #f83224;
-      color: #fff;
-      border-radius: 40rpx;
-    }
-  }
-}
-</style>
+			.save {
+				width: 702rpx;
+				margin: 0 auto;
+				background-color: #f83224;
+				color: #fff;
+				border-radius: 40rpx;
+			}
+		}
+	}
+</style>

+ 39 - 33
pages/index/index.vue

@@ -30,12 +30,12 @@
 			<!-- 商城 -->
 			<swiper-item>
 				<view>
-					<kj-express :language='language'></kj-express>
+					<kj-express ref="express" :language='language'></kj-express>
 				</view>
 			</swiper-item>
 			<swiper-item>
 				<view>
-					<kj-index :language='language'></kj-index>
+					<kj-index ref='index' :language='language'></kj-index>
 				</view>
 			</swiper-item>
 		</swiper>
@@ -114,6 +114,10 @@
 			// this.getlista()
 		},
 		onShow() {
+			this.$refs.express.express()
+			this.$refs.express.getexpress();
+			// this.$refs.express.getlist();
+			this.$refs.index.getlista();
 			// this.config()
 			// // tabs列表
 			// this.category()
@@ -123,11 +127,13 @@
 			// this.pack()
 			// //海外包邮
 			// this.shipp()
-			// this.recommend()
+			// this.recommend()、
+			this.getlist()
+			
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')
 			}
-			// this.HXlogin()
+			this.HXlogin()
 			this.$refs.kjTabbar.getNumber();
 		},
 		methods: {
@@ -153,36 +159,36 @@
 
 			// 	})
 			// },
-			// HXlogin() {
-			// 	if (uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
-			// 		var user_no = uni.getStorageSync('user_no')
-			// 		var pwd = uni.getStorageSync('pwd')
-			// 		conn.open({
-			// 			user: user_no,
-			// 			pwd: pwd,
-			// 			appKey: conn.appkey
-			// 		}).then(() => {
-			// 			console.log('res');
-			// 			this.getlist()
-			// 		}).catch(reason => {
-			// 			console.log('失败', reason);
-			// 		})
+			HXlogin() {
+				if (uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
+					var user_no = uni.getStorageSync('user_no')
+					var pwd = uni.getStorageSync('pwd')
+					conn.open({
+						user: user_no,
+						pwd: pwd,
+						appKey: conn.appkey
+					}).then(() => {
+						console.log('res');
+						this.getlist()
+					}).catch(reason => {
+						console.log('失败', reason);
+					})
 
-			// 	}
-			// },
-			// getlist() {
-			// 	this.unReadCount = 0
-			// 	conn.getServerConversations({
-			// 		pageSize: 50,
-			// 		cursor: ''
-			// 	}).then((res) => {
-			// 		console.log(res);
-			// 		res.data.conversations.forEach((item) => {
-			// 			this.unReadCount += item.unReadCount
-			// 		})
-			// 		console.log(this.unReadCount);
-			// 	})
-			// },
+				}
+			},
+			getlist() {
+				this.unReadCount = 0
+				conn.getServerConversations({
+					pageSize: 50,
+					cursor: ''
+				}).then((res) => {
+					console.log(res);
+					res.data.conversations.forEach((item) => {
+						this.unReadCount += item.unReadCount
+					})
+					console.log(this.unReadCount);
+				})
+			},
 			callphone() {
 				uni.$u.http.get('/api/config', {
 					params: {

+ 3 - 3
pages/login/login.vue

@@ -13,8 +13,8 @@
 			微信授权登录
 		</button>
 
-
-<!-- 		<view>
+<!-- 
+		<view>
 			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
 			<u--input placeholder="请输入内容" border="surround" v-model="code"></u--input>
 		</view>
@@ -165,7 +165,7 @@
 				this.changea = n;
 			},
 			submit() {
-				// login({ mobile: "13000000000", password: "123456" }).then((res) => {
+				// login({ mobile: "13523652365", password: "123456" }).then((res) => {
 				//   console.log(res);
 				//   if (res.data.code == 10000) {
 				//     uni.setStorage({

+ 1 - 1
pages/mine/component/teamFunction.vue

@@ -27,7 +27,7 @@
 				<image class="form-icon" style="padding: 0 15px" src="../../../static/mine/pc.png" mode=""></image>
 				<view class="characters">{{ i18n.PCEnd }}</view>
 			</view>
-			<view class="icon-center" v-if="user_no !='13523652365'" @click="tokefu">
+			<view class="icon-center" v-if="user_no !='19550568052'" @click="tokefu">
 				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
 				<view class="characters">{{ i18n.pontact }}</view>
 			</view>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/common/runtime.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-express/kj-express.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-express/kj-express.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-express/kj-express.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxml


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

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

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/search.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/search.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1 +1 @@
-.payment.data-v-61a7d3c4{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-61a7d3c4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-61a7d3c4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-61a7d3c4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-61a7d3c4{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-61a7d3c4{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-61a7d3c4{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-61a7d3c4{position:relative}.back .topbox .state.data-v-61a7d3c4{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-61a7d3c4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-61a7d3c4{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+.payment.data-v-cef19d80{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-cef19d80{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-cef19d80{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-cef19d80{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-cef19d80{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-cef19d80{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-cef19d80{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-cef19d80{position:relative}.back .topbox .state.data-v-cef19d80{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-cef19d80{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-cef19d80{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/shoplist.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/shoplist.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/shoplist.wxss

@@ -1 +1 @@
-.box.data-v-1141e5a4{width:750rpx;min-height:1360rpx;background:#fff;border-radius:28rpx 28rpx 0rpx 0rpx;padding:38rpx 20rpx 20rpx;box-sizing:border-box;margin-top:20rpx}.pop.data-v-1141e5a4{width:750rpx;background:#fff;padding:36rpx 32rpx;box-sizing:border-box}.pop .btn1.data-v-1141e5a4{width:702rpx;height:84rpx;background:rgba(248,50,36,.1);border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#f83224;line-height:84rpx;text-align:center;font-style:normal;border-radius:42rpx 0 0 42rpx}.pop .btn2.data-v-1141e5a4{width:702rpx;height:84rpx;background:#f83224;border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal;border-radius:0rpx 42rpx 42rpx 0}.pop .item.data-v-1141e5a4{width:206rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#131415;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx}.pop .acitem.data-v-1141e5a4{width:206rpx;height:64rpx;font-family:PingFangSC,PingFang SC;font-weight:400;border-radius:36rpx;font-size:24rpx;color:#f83224;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx;background:rgba(248,50,36,.1);border:1rpx solid #f83224;box-sizing:border-box}.pop .title.data-v-1141e5a4{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:26rpx;color:#131415;line-height:36rpx;text-align:left;font-style:normal;margin-bottom:24rpx}.pop .input.data-v-1141e5a4{width:312rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx}
+.box.data-v-c6f08e70{width:750rpx;min-height:1360rpx;border-radius:28rpx 28rpx 0rpx 0rpx;padding:38rpx 20rpx 20rpx;box-sizing:border-box;margin-top:20rpx}.pop.data-v-c6f08e70{width:750rpx;background:#fff;padding:36rpx 32rpx;box-sizing:border-box}.pop .btn1.data-v-c6f08e70{width:702rpx;height:84rpx;background:rgba(248,50,36,.1);border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#f83224;line-height:84rpx;text-align:center;font-style:normal;border-radius:42rpx 0 0 42rpx}.pop .btn2.data-v-c6f08e70{width:702rpx;height:84rpx;background:#f83224;border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal;border-radius:0rpx 42rpx 42rpx 0}.pop .item.data-v-c6f08e70{width:206rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#131415;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx}.pop .acitem.data-v-c6f08e70{width:206rpx;height:64rpx;font-family:PingFangSC,PingFang SC;font-weight:400;border-radius:36rpx;font-size:24rpx;color:#f83224;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx;background:rgba(248,50,36,.1);border:1rpx solid #f83224;box-sizing:border-box}.pop .title.data-v-c6f08e70{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:26rpx;color:#131415;line-height:36rpx;text-align:left;font-style:normal;margin-bottom:24rpx}.pop .input.data-v-c6f08e70{width:312rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/expresstype.js


+ 1 - 0
unpackage/dist/build/mp-weixin/pageB/expresstype.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "快递服务",
   "enablePullDownRefresh": false,
   "usingComponents": {
+    "u--input": "/uview-ui/components/u--input/u--input",
     "u-radio-group": "/uview-ui/components/u-radio-group/u-radio-group",
     "u-radio": "/uview-ui/components/u-radio/u-radio"
   }

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/expresstype.wxml

@@ -1 +1 @@
-<view class="box data-v-15dc6eed"><view class="exp data-v-15dc6eed"><u-radio-group vue-id="7279ef76-1" placement="column" value="{{radiovalue1}}" data-event-opts="{{[['^change',[['groupChange']]],['^input',[['__set_model',['','radiovalue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-15dc6eed" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{radiolist1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><block wx:if="{{idx<page}}"><view class="item u-flex u-row-between data-v-15dc6eed"><text class="data-v-15dc6eed">{{item.name}}</text><u-radio vue-id="{{('7279ef76-2-'+idx)+','+('7279ef76-1')}}" name="{{item.name}}" data-event-opts="{{[['^change',[['radioChange',['$0'],[[['radiolist1','',idx]]]]]]]}}" bind:change="__e" class="data-v-15dc6eed" bind:__l="__l"></u-radio></view></block></block></u-radio-group></view><view class="bottom data-v-15dc6eed"><view data-event-opts="{{[['tap',[['toteach',['$event']]]]]}}" class="btn data-v-15dc6eed" bindtap="__e">{{''+i18n.enter+''}}</view></view></view>
+<view class="box data-v-160afa5f"><view style="background:#fff;margin-bottom:20rpx;" class="data-v-160afa5f"><u--input vue-id="7279ef76-1" placeholder="{{i18n.logisticsmethod}}" border="surround" value="{{keyword}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-160afa5f" bind:__l="__l"></u--input></view><view class="exp data-v-160afa5f"><u-radio-group vue-id="7279ef76-2" placement="column" value="{{radiovalue1}}" data-event-opts="{{[['^change',[['groupChange']]],['^input',[['__set_model',['','radiovalue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-160afa5f" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{radiolist1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><block wx:if="{{idx<page}}"><view class="item u-flex u-row-between data-v-160afa5f"><text class="data-v-160afa5f">{{item.name}}</text><u-radio vue-id="{{('7279ef76-3-'+idx)+','+('7279ef76-2')}}" name="{{item.name}}" data-event-opts="{{[['^change',[['radioChange',['$0'],[[['radiolist1','',idx]]]]]]]}}" bind:change="__e" class="data-v-160afa5f" bind:__l="__l"></u-radio></view></block></block></u-radio-group></view><view class="bottom data-v-160afa5f"><view data-event-opts="{{[['tap',[['toteach',['$event']]]]]}}" class="btn data-v-160afa5f" bindtap="__e">{{''+i18n.enter+''}}</view></view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/expresstype.wxss

@@ -1 +1 @@
-.box.data-v-15dc6eed{padding:20rpx 24rpx;box-sizing:border-box}.box .bottom.data-v-15dc6eed{width:750rpx;height:166rpx;background:#fff;padding:18rpx 32rpx;box-sizing:border-box;position:fixed;bottom:0;left:0}.box .bottom .btn.data-v-15dc6eed{width:686rpx;height:88rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal}.box .item.data-v-15dc6eed{width:654rpx;height:112rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.box .exp.data-v-15dc6eed{width:702rpx;background:#fff;border-radius:16rpx;padding:0 20rpx}
+.box.data-v-160afa5f{padding:20rpx 24rpx;box-sizing:border-box}.box .bottom.data-v-160afa5f{width:750rpx;height:166rpx;background:#fff;padding:18rpx 32rpx;box-sizing:border-box;position:fixed;bottom:0;left:0}.box .bottom .btn.data-v-160afa5f{width:686rpx;height:88rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal}.box .item.data-v-160afa5f{width:654rpx;height:112rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.box .exp.data-v-160afa5f{background:#fff;border-radius:16rpx;padding:0 20rpx}

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"29cc":function(n,e,t){"use strict";var r=t("9b36"),o=t.n(r);o.a},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},8079:function(n,e,t){"use strict";t.r(e);var r=t("86be"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("29cc");var i,c=t("f0c5"),a=Object(c["a"])(o["default"],r["b"],r["c"],!1,null,"185ecc00",null,!1,r["a"],i);e["default"]=a.exports},"86be":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"9b36":function(n,e,t){},"9e74":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.myPackage+"-"+this.i18n.Vieworder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/express/express"})}}};e.default=t}).call(this,t("543d")["default"])},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"35a1":function(n,t,e){"use strict";(function(n,t){var o=e("4ea4");e("f93b");o(e("66fd"));var r=o(e("8079"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(r.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"41f3":function(n,t,e){"use strict";var o=e("59aa"),r=e.n(o);r.a},"59aa":function(n,t,e){},8079:function(n,t,e){"use strict";e.r(t);var o=e("a5cd"),r=e("ff47");for(var u in r)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(u);e("41f3");var i,a=e("f0c5"),c=Object(a["a"])(r["default"],o["b"],o["c"],!1,null,"5fc95d24",null,!1,o["a"],i);t["default"]=c.exports},"9e74":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.config()},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/index/index"})},config:function(){var t=this;n.$u.http.get("/api/config?module=express").then((function(n){t.$u.toast(n.prompt)}))}}};t.default=e}).call(this,e("543d")["default"])},a5cd:function(n,t,e){"use strict";e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){return o}));var o={uNavbar:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-navbar/u-navbar")]).then(e.bind(null,"b6bd"))}},r=function(){var n=this,t=n.$createElement;n._self._c},u=[]},ff47:function(n,t,e){"use strict";e.r(t);var o=e("9e74"),r=e.n(o);for(var u in o)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(u);t["default"]=r.a}},[["35a1","common/runtime","common/vendor"]]]);

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/orderinfo.wxml

@@ -1 +1 @@
-<view class="back data-v-185ecc00"><u-navbar vue-id="5e7558e4-1" title="{{i18n.Vieworder}}" autoBack="{{false}}" placeholder="{{true}}" data-event-opts="{{[['^leftClick',[['leftClick']]]]}}" bind:leftClick="__e" class="data-v-185ecc00" bind:__l="__l"></u-navbar><view class="top u-flex u-row-between data-v-185ecc00"><text class="success data-v-185ecc00">{{i18n.successful}}</text><text class="sun data-v-185ecc00">{{i18n.pickpackage}}</text></view><view class="address data-v-185ecc00"><view style="margin-top:44rpx;" class="data-v-185ecc00"><view class="u-flex data-v-185ecc00"><image style="width:44rpx;height:44rpx;" src="/static/express/ji.png" mode class="data-v-185ecc00"></image><text class="name data-v-185ecc00" style="margin-left:28rpx;">{{orderinfo.from_name}}</text><text class="name data-v-185ecc00" style="margin-left:12rpx;">{{orderinfo.from_mobile}}</text></view><view class="info data-v-185ecc00" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.from_full_address+''}}</view></view><view style="margin:44rpx 0;" class="data-v-185ecc00"><view class="u-flex data-v-185ecc00"><image style="width:44rpx;height:44rpx;" src="/static/express/shou.png" mode class="data-v-185ecc00"></image><text class="name data-v-185ecc00" style="margin-left:28rpx;">{{orderinfo.transit_name}}</text><text class="name data-v-185ecc00" style="margin-left:12rpx;">{{orderinfo.transit_mobile}}</text></view><view class="info data-v-185ecc00" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.transit_full_address+''}}</view></view></view><view class="orderinfo data-v-185ecc00"><view class="num data-v-185ecc00"><text class="num data-v-185ecc00">{{i18n.OrderNumber+":"}}</text><text class="num data-v-185ecc00">{{orderinfo.order_no}}</text></view><view class="num data-v-185ecc00" style="margin-top:50rpx;"><text class="num data-v-185ecc00">{{i18n.Ordertime+":"}}</text><text class="num data-v-185ecc00">{{orderinfo.created_at}}</text></view></view></view>
+<view class="back data-v-5fc95d24"><u-navbar vue-id="5e7558e4-1" title="{{i18n.Vieworder}}" autoBack="{{false}}" placeholder="{{true}}" data-event-opts="{{[['^leftClick',[['leftClick']]]]}}" bind:leftClick="__e" class="data-v-5fc95d24" bind:__l="__l"></u-navbar><view class="top u-flex u-row-between data-v-5fc95d24"><text class="success data-v-5fc95d24">{{i18n.successful}}</text></view><view class="address data-v-5fc95d24"><view style="margin-top:44rpx;" class="data-v-5fc95d24"><view class="u-flex data-v-5fc95d24"><image style="width:44rpx;height:44rpx;" src="/static/express/ji.png" mode class="data-v-5fc95d24"></image><text class="name data-v-5fc95d24" style="margin-left:28rpx;">{{orderinfo.from_name}}</text><text class="name data-v-5fc95d24" style="margin-left:12rpx;">{{orderinfo.from_mobile}}</text></view><view class="info data-v-5fc95d24" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.from_full_address+''}}</view></view><view style="margin:44rpx 0;" class="data-v-5fc95d24"><view class="u-flex data-v-5fc95d24"><image style="width:44rpx;height:44rpx;" src="/static/express/shou.png" mode class="data-v-5fc95d24"></image><text class="name data-v-5fc95d24" style="margin-left:28rpx;">{{orderinfo.transit_name}}</text><text class="name data-v-5fc95d24" style="margin-left:12rpx;">{{orderinfo.transit_mobile}}</text></view><view class="info data-v-5fc95d24" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.transit_full_address+''}}</view></view></view><view class="orderinfo data-v-5fc95d24"><view class="num data-v-5fc95d24"><text class="num data-v-5fc95d24">{{i18n.OrderNumber+":"}}</text><text class="num data-v-5fc95d24">{{orderinfo.order_no}}</text></view><view class="num data-v-5fc95d24" style="margin-top:50rpx;"><text class="num data-v-5fc95d24">{{i18n.Ordertime+":"}}</text><text class="num data-v-5fc95d24">{{orderinfo.created_at}}</text></view></view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/orderinfo.wxss

@@ -1 +1 @@
-.orderinfo.data-v-185ecc00{width:702rpx;height:184rpx;background:#fff;border-radius:16rpx;margin-top:20rpx;padding:36rpx 28rpx 0;box-sizing:border-box}.orderinfo .num.data-v-185ecc00{font-family:SFPro;font-weight:400;font-size:26rpx;color:#555;line-height:30rpx;text-align:left;font-style:normal}.back.data-v-185ecc00{padding:20rpx 24rpx;box-sizing:border-box}.back .top.data-v-185ecc00{width:702rpx;height:100rpx;background:linear-gradient(291deg,#fff4f4,#fbdfdf 100%,#fbdfdf 0);border-radius:16rpx 16rpx 0 0;border:1rpx solid;border-image:linear-gradient(270deg,#fff,hsla(0,0%,100%,0)) 1 1;padding:0 24rpx;box-sizing:border-box}.back .top .success.data-v-185ecc00{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .top .sun.data-v-185ecc00{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.back .address.data-v-185ecc00{width:702rpx;background:#fff;border-radius:16rpx;padding:1rpx 32rpx;box-sizing:border-box}.back .address .name.data-v-185ecc00{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .address .info.data-v-185ecc00{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#777;line-height:36rpx;text-align:left;font-style:normal;margin-top:18rpx}
+.orderinfo.data-v-5fc95d24{width:702rpx;height:184rpx;background:#fff;border-radius:16rpx;margin-top:20rpx;padding:36rpx 28rpx 0;box-sizing:border-box}.orderinfo .num.data-v-5fc95d24{font-family:SFPro;font-weight:400;font-size:26rpx;color:#555;line-height:30rpx;text-align:left;font-style:normal}.back.data-v-5fc95d24{padding:20rpx 24rpx;box-sizing:border-box}.back .top.data-v-5fc95d24{width:702rpx;height:100rpx;background:linear-gradient(291deg,#fff4f4,#fbdfdf 100%,#fbdfdf 0);border-radius:16rpx 16rpx 0 0;border:1rpx solid;border-image:linear-gradient(270deg,#fff,hsla(0,0%,100%,0)) 1 1;padding:0 24rpx;box-sizing:border-box}.back .top .success.data-v-5fc95d24{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .top .sun.data-v-5fc95d24{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.back .address.data-v-5fc95d24{width:702rpx;background:#fff;border-radius:16rpx;padding:1rpx 32rpx;box-sizing:border-box}.back .address .name.data-v-5fc95d24{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .address .info.data-v-5fc95d24{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#777;line-height:36rpx;text-align:left;font-style:normal;margin-top:18rpx}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/search.js


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

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

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/search.wxss

@@ -1 +1 @@
-.searchitem.data-v-1ef384d5{height:98rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1);line-height:98rpx}.title.data-v-1ef384d5{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.tabs.data-v-1ef384d5{height:58rpx;background:#f5f5f5;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;text-align:center;font-style:normal;display:inline;padding:12rpx 24rpx;box-sizing:border-box;margin-top:24rpx}.back.data-v-1ef384d5{padding:28rpx 20rpx!important;background-color:#fff;min-height:calc(100vh - 44rpx)}
+.searchitem.data-v-10c16375{height:98rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1);line-height:98rpx}.title.data-v-10c16375{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.tabs.data-v-10c16375{height:58rpx;background:#f5f5f5;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;text-align:center;font-style:normal;display:inline;padding:12rpx 24rpx;box-sizing:border-box;margin-top:24rpx}.back.data-v-10c16375{padding:28rpx 20rpx!important;background-color:#fff;min-height:calc(100vh - 44rpx)}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.wxml


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

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

+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/refusePopup.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{5393:function(n,e,t){"use strict";t.r(e);var u=t("9134"),o=t("9ee6");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("fb8b");var a,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7709bcd4",null,!1,u["a"],a);e["default"]=f.exports},9134:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"9ee6":function(n,e,t){"use strict";t.r(e);var u=t("cf3f0"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},b34d:function(n,e,t){},cf3f0:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(n){n||(this.value2="")}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{value2:""}},methods:{close:function(){}}};e.default=u},fb8b:function(n,e,t){"use strict";var u=t("b34d"),o=t.n(u);o.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{5393:function(n,e,t){"use strict";t.r(e);var u=t("9134"),o=t("9ee6");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("fb8b");var a,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7709bcd4",null,!1,u["a"],a);e["default"]=f.exports},9134:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"9ee6":function(n,e,t){"use strict";t.r(e);var u=t("cf3f"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},b34d:function(n,e,t){},cf3f:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(n){n||(this.value2="")}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{value2:""}},methods:{close:function(){}}};e.default=u},fb8b:function(n,e,t){"use strict";var u=t("b34d"),o=t.n(u);o.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/refusePopup-create-component',
     {

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/logisticsProgress/logisticsProgress.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.wxss

@@ -1 +1 @@
-.page.data-v-ebe5eb24{padding:20rpx 24rpx}.page .content.data-v-ebe5eb24{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .bottom-1.data-v-ebe5eb24{font-size:20rpx;margin-top:68rpx;color:#555;display:flex;justify-content:flex-start;align-items:center;width:70%}.page .bottom-1 .radio.data-v-ebe5eb24{width:24rpx;height:24rpx}.page .btn.data-v-ebe5eb24{color:#fff;background-color:#f83224;border-radius:44rpx;margin-top:28rpx;height:88rpx;font-size:32rpx}
+.page.data-v-31403b3e{padding:20rpx 24rpx}.page .content.data-v-31403b3e{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .bottom-1.data-v-31403b3e{font-size:20rpx;margin-top:68rpx;color:#555;display:flex;justify-content:flex-start;align-items:center;width:70%}.page .bottom-1 .radio.data-v-31403b3e{width:24rpx;height:24rpx}.page .btn.data-v-31403b3e{color:#fff;background-color:#f83224;border-radius:44rpx;margin-top:28rpx;height:88rpx;font-size:32rpx}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/login/login.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/login/login.wxml

@@ -1 +1 @@
-<view style="padding:0 44rpx;background-color:#fff;height:100vh;overflow:hidden;" class="data-v-927f464e"><view style="text-align:center;margin-top:156rpx;" class="data-v-927f464e"><image style="width:350rpx;height:350rpx;" src="../../static/images/logo.png" mode class="data-v-927f464e"></image></view><button class="login-btn data-v-927f464e" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['tologin',['$event']]]]]}}" bindgetphonenumber="__e">微信授权登录</button><view style="margin-top:42rpx;display:flex;" class="data-v-927f464e"><u-checkbox-group vue-id="35a7246c-1" placement="column" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-927f464e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('35a7246c-2')+','+('35a7246c-1')}}" shape="circle" customStyle="{{({marginBottom:'8px'})}}" name="{{1}}" class="data-v-927f464e" bind:__l="__l"></u-checkbox></u-checkbox-group><text class="fontYin data-v-927f464e">{{i18n.readandAgree}}</text><text data-event-opts="{{[['tap',[['xieyi',['user']]]]]}}" class="fontYin data-v-927f464e" style="color:#f83224;" bindtap="__e">{{"《"+i18n.useragreement+"》"}}</text><text class="fontYin data-v-927f464e">{{i18n.and}}</text><text data-event-opts="{{[['tap',[['xieyi',['private']]]]]}}" class="fontYin data-v-927f464e" style="color:#f83224;" bindtap="__e">{{"《"+i18n.Privacyagreement+"》"}}</text></view></view>
+<view style="padding:0 44rpx;background-color:#fff;height:100vh;overflow:hidden;" class="data-v-1f1d6df2"><view style="text-align:center;margin-top:156rpx;" class="data-v-1f1d6df2"><image style="width:350rpx;height:350rpx;" src="../../static/images/logo.png" mode class="data-v-1f1d6df2"></image></view><button class="login-btn data-v-1f1d6df2" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['tologin',['$event']]]]]}}" bindgetphonenumber="__e">微信授权登录</button><view style="margin-top:42rpx;display:flex;" class="data-v-1f1d6df2"><u-checkbox-group vue-id="35a7246c-1" placement="column" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-1f1d6df2" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('35a7246c-2')+','+('35a7246c-1')}}" shape="circle" customStyle="{{({marginBottom:'8px'})}}" name="{{1}}" class="data-v-1f1d6df2" bind:__l="__l"></u-checkbox></u-checkbox-group><text class="fontYin data-v-1f1d6df2">{{i18n.readandAgree}}</text><text data-event-opts="{{[['tap',[['xieyi',['user']]]]]}}" class="fontYin data-v-1f1d6df2" style="color:#f83224;" bindtap="__e">{{"《"+i18n.useragreement+"》"}}</text><text class="fontYin data-v-1f1d6df2">{{i18n.and}}</text><text data-event-opts="{{[['tap',[['xieyi',['private']]]]]}}" class="fontYin data-v-1f1d6df2" style="color:#f83224;" bindtap="__e">{{"《"+i18n.Privacyagreement+"》"}}</text></view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/login/login.wxss

@@ -1 +1 @@
-page.data-v-927f464e{background-color:#fff!important;height:100vh}.login-btn.data-v-927f464e{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-927f464e{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}
+page.data-v-1f1d6df2{background-color:#fff!important;height:100vh}.login-btn.data-v-1f1d6df2{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-1f1d6df2{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}

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

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

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

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

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

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

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/component/teamFunction"],{"0bdf":function(n,t,e){"use strict";var u=e("207c"),r=e.n(u);r.a},"207c":function(n,t,e){},3352:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement;n._self._c},c=[]},8707:function(n,t,e){"use strict";e.r(t);var u=e("9493"),r=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=r.a},"902c":function(n,t,e){"use strict";e.r(t);var u=e("3352"),r=e("8707");for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);e("0bdf");var o,a=e("f0c5"),i=Object(a["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],o);t["default"]=i.exports},9493:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{user_no:""}},computed:{i18n:function(){return this.$t("index")}},created:function(){n.getStorageSync("user_no")&&(this.user_no=n.getStorageSync("user_no"))},methods:{tokefu:function(){n.navigateTo({url:"/pageA/service/service"})},toNextPage:function(t){n.navigateTo({url:t})}}};t.default=e}).call(this,e("543d")["default"])}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/component/teamFunction"],{"0bdf":function(n,t,e){"use strict";var u=e("207c"),r=e.n(u);r.a},"207c":function(n,t,e){},8707:function(n,t,e){"use strict";e.r(t);var u=e("9493"),r=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=r.a},"902c":function(n,t,e){"use strict";e.r(t);var u=e("948b"),r=e("8707");for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);e("0bdf");var o,a=e("f0c5"),i=Object(a["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],o);t["default"]=i.exports},"948b":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement;n._self._c},c=[]},9493:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{user_no:""}},computed:{i18n:function(){return this.$t("index")}},created:function(){n.getStorageSync("user_no")&&(this.user_no=n.getStorageSync("user_no"))},methods:{tokefu:function(){n.navigateTo({url:"/pageA/service/service"})},toNextPage:function(t){n.navigateTo({url:t})}}};t.default=e}).call(this,e("543d")["default"])}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pages/mine/component/teamFunction-create-component',
     {

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

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

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-express/kj-express.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/search.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/payorder.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoplist.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/end.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/expresstype.js.map


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff