浏览代码

修改商品详情

zhaogongxue 4 月之前
父节点
当前提交
591b27f5fa
共有 77 个文件被更改,包括 1023 次插入1165 次删除
  1. 3 3
      components/kj-chat/kj-chat.vue
  2. 937 1085
      components/kj-express/kj-express.vue
  3. 1 1
      pageA/chat/chat.vue
  4. 3 3
      pageA/chat/news.vue
  5. 3 3
      pageA/chat/search.vue
  6. 7 9
      pageA/productdetails.vue
  7. 1 1
      pageA/service/service.vue
  8. 33 32
      pages/index/index.vue
  9. 3 3
      pages/login/login.vue
  10. 1 1
      pages/mine/component/teamFunction.vue
  11. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  12. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.js
  13. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxml
  14. 0 0
      unpackage/dist/build/mp-weixin/components/kj-express/kj-express.js
  15. 0 0
      unpackage/dist/build/mp-weixin/components/kj-express/kj-express.wxml
  16. 0 0
      unpackage/dist/build/mp-weixin/components/kj-express/kj-express.wxss
  17. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  18. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml
  19. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  20. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.wxml
  21. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/search.js
  22. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/search.wxml
  23. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.js
  24. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.wxml
  25. 1 1
      unpackage/dist/build/mp-weixin/pageA/payorder.wxss
  26. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.js
  27. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoplist.js
  28. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoplist.wxml
  29. 1 1
      unpackage/dist/build/mp-weixin/pageA/shoplist.wxss
  30. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.js
  31. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxml
  32. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxss
  33. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.js
  34. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.wxml
  35. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.wxss
  36. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  37. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  38. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  39. 0 0
      unpackage/dist/build/mp-weixin/pages/login/login.js
  40. 1 1
      unpackage/dist/build/mp-weixin/pages/login/login.wxml
  41. 1 1
      unpackage/dist/build/mp-weixin/pages/login/login.wxss
  42. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json
  43. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json
  44. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json
  45. 1 1
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.js
  46. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json
  47. 0 0
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.wxml
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-express/kj-express.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/search.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/component/teamFunction.js.map
  58. 0 0
      unpackage/dist/dev/mp-weixin/common/vendor.js
  59. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.js
  60. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.wxml
  61. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.js
  62. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.wxml
  63. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/chat.wxml
  64. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/news.js
  65. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/news.wxml
  66. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/search.js
  67. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/search.wxml
  68. 0 0
      unpackage/dist/dev/mp-weixin/pageA/productdetails.js
  69. 0 0
      unpackage/dist/dev/mp-weixin/pageA/productdetails.wxml
  70. 0 0
      unpackage/dist/dev/mp-weixin/pageA/service/service.js
  71. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  72. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json
  73. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json
  74. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json
  75. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json
  76. 0 0
      unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.wxml
  77. 7 0
      unpackage/dist/dev/mp-weixin/project.private.config.json

+ 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 - 1085
components/kj-express/kj-express.vue

@@ -1,1181 +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
-		: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>
-    <!-- <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/index/index?current=0",
-      };
-    },
-    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(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",
-      });
-    },
-  },
-};
+						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>

+ 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="">

+ 7 - 9
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>
@@ -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('2222',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: {},

+ 33 - 32
pages/index/index.vue

@@ -116,7 +116,7 @@
 		onShow() {
 			this.$refs.express.express()
 			this.$refs.express.getexpress();
-			this.$refs.express.getlist();
+			// this.$refs.express.getlist();
 			this.$refs.index.getlista();
 			// this.config()
 			// // tabs列表
@@ -127,12 +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: {
@@ -158,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>

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-express/kj-express.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-express/kj-express.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-express/kj-express.wxss


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/search.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/search.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.js


文件差异内容过多而无法显示
+ 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}

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/shoplist.js


文件差异内容过多而无法显示
+ 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}

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.wxss


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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"0dc8":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 i}));var i={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},r=[]},"35a1":function(n,e,t){"use strict";(function(n,e){var i=t("4ea4");t("f93b");i(t("66fd"));var o=i(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"668f":function(n,e,t){},8079:function(n,e,t){"use strict";t.r(e);var i=t("0dc8"),o=t("ff47");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("de32");var u,a=t("f0c5"),c=Object(a["a"])(o["default"],i["b"],i["c"],!1,null,"6f97ee04",null,!1,i["a"],u);e["default"]=c.exports},"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/index/index"})}}};e.default=t}).call(this,t("543d")["default"])},de32:function(n,e,t){"use strict";var i=t("668f"),o=t.n(i);o.a},ff47:function(n,e,t){"use strict";t.r(e);var i=t("9e74"),o=t.n(i);for(var r in i)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return i[n]}))}(r);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-6f97ee04"><u-navbar vue-id="5e7558e4-1" title="{{i18n.Vieworder}}" autoBack="{{false}}" placeholder="{{true}}" data-event-opts="{{[['^leftClick',[['leftClick']]]]}}" bind:leftClick="__e" class="data-v-6f97ee04" bind:__l="__l"></u-navbar><view class="top u-flex u-row-between data-v-6f97ee04"><text class="success data-v-6f97ee04">{{i18n.successful}}</text><text class="sun data-v-6f97ee04">{{i18n.pickpackage}}</text></view><view class="address data-v-6f97ee04"><view style="margin-top:44rpx;" class="data-v-6f97ee04"><view class="u-flex data-v-6f97ee04"><image style="width:44rpx;height:44rpx;" src="/static/express/ji.png" mode class="data-v-6f97ee04"></image><text class="name data-v-6f97ee04" style="margin-left:28rpx;">{{orderinfo.from_name}}</text><text class="name data-v-6f97ee04" style="margin-left:12rpx;">{{orderinfo.from_mobile}}</text></view><view class="info data-v-6f97ee04" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.from_full_address+''}}</view></view><view style="margin:44rpx 0;" class="data-v-6f97ee04"><view class="u-flex data-v-6f97ee04"><image style="width:44rpx;height:44rpx;" src="/static/express/shou.png" mode class="data-v-6f97ee04"></image><text class="name data-v-6f97ee04" style="margin-left:28rpx;">{{orderinfo.transit_name}}</text><text class="name data-v-6f97ee04" style="margin-left:12rpx;">{{orderinfo.transit_mobile}}</text></view><view class="info data-v-6f97ee04" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.transit_full_address+''}}</view></view></view><view class="orderinfo data-v-6f97ee04"><view class="num data-v-6f97ee04"><text class="num data-v-6f97ee04">{{i18n.OrderNumber+":"}}</text><text class="num data-v-6f97ee04">{{orderinfo.order_no}}</text></view><view class="num data-v-6f97ee04" style="margin-top:50rpx;"><text class="num data-v-6f97ee04">{{i18n.Ordertime+":"}}</text><text class="num data-v-6f97ee04">{{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-6f97ee04{width:702rpx;height:184rpx;background:#fff;border-radius:16rpx;margin-top:20rpx;padding:36rpx 28rpx 0;box-sizing:border-box}.orderinfo .num.data-v-6f97ee04{font-family:SFPro;font-weight:400;font-size:26rpx;color:#555;line-height:30rpx;text-align:left;font-style:normal}.back.data-v-6f97ee04{padding:20rpx 24rpx;box-sizing:border-box}.back .top.data-v-6f97ee04{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-6f97ee04{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-6f97ee04{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-6f97ee04{width:702rpx;background:#fff;border-radius:16rpx;padding:1rpx 32rpx;box-sizing:border-box}.back .address .name.data-v-6f97ee04{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-6f97ee04{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}

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxss


文件差异内容过多而无法显示
+ 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": {}
 }

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-express/kj-express.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/search.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/component/teamFunction.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/chat.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/news.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/news.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/search.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/search.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/productdetails.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/productdetails.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/service/service.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.js


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

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

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

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

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

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

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

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

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.wxml


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

@@ -86,6 +86,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pageA/productdetails",
+          "query": "id=19",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

部分文件因为文件数量过多而无法显示