소스 검색

更新代码

mabaoyi 7 달 전
부모
커밋
6becdb2f10
100개의 변경된 파일1953개의 추가작업 그리고 1398개의 파일을 삭제
  1. 1 1
      manifest.json
  2. 1213 989
      pageA/order.vue
  3. 21 3
      pageC/applicationRefund/applicationRefund.vue
  4. 20 16
      pageC/orderForm/component/orderInofrmation.vue
  5. 17 2
      pageC/orderForm/orderForm.vue
  6. 2 2
      pageC/orderFormDetail/component/commodityDetail.vue
  7. 59 22
      pageC/orderFormDetail/orderFormDetail.vue
  8. 1 1
      pageC/refundDetail/component/refundInProgress.vue
  9. 2 2
      pageC/refundDetail/component/refundInformation.vue
  10. 2 2
      pageC/refundDetail/component/refusalToRefund.vue
  11. 1 1
      pageD/afterSalesDetail/afterSalesDetail.vue
  12. 4 1
      pageD/afterSalesDetail/component/applicationInformation.vue
  13. 1 0
      pageD/afterSalesManage/afterSalesManage.vue
  14. 10 2
      pageD/afterSalesManage/component/agreePop.vue
  15. 29 2
      pageD/components/agreePopup.vue
  16. 2 2
      pageD/components/goodsInformation.vue
  17. 330 286
      pageD/homepage/homepage.vue
  18. 10 2
      pageD/newBulitOrder/component/commodity.vue
  19. 42 21
      pageD/newBulitOrder/component/goodsInformation.vue
  20. 47 5
      pageD/newBulitOrder/component/nextLogistics.vue
  21. 5 2
      pageD/newBulitOrder/component/selectLogistics.vue
  22. 44 7
      pageD/newBulitOrder/newBulitOrder.vue
  23. 4 3
      pageD/orderDetail/orderDetail.vue
  24. 2 2
      pageD/orderFormManage/component/detailCard.vue
  25. 14 0
      pageD/orderFormManage/orderFormManage.vue
  26. 2 1
      pageD/orderInformation/orderInformation.vue
  27. 37 1
      pageD/productDetails/productDetails.vue
  28. 13 2
      pageD/supplyChainGoods/supplyChainGoods.vue
  29. BIN
      static/images/warning.png
  30. 0 0
      unpackage/dist/build/mp-weixin/common/main.js
  31. 0 0
      unpackage/dist/build/mp-weixin/common/runtime.js
  32. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  33. 0 0
      unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.js
  34. 0 0
      unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.js
  35. 0 0
      unpackage/dist/build/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js
  36. 1 1
      unpackage/dist/build/mp-weixin/pageA/balance.js
  37. 0 0
      unpackage/dist/build/mp-weixin/pageA/changelange.js
  38. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  39. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml
  40. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  41. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.wxml
  42. 0 0
      unpackage/dist/build/mp-weixin/pageA/comment.js
  43. 1 1
      unpackage/dist/build/mp-weixin/pageA/confirm.js
  44. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.js
  45. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.wxml
  46. 1 1
      unpackage/dist/build/mp-weixin/pageA/index.js
  47. 0 0
      unpackage/dist/build/mp-weixin/pageA/logisticsinfo.js
  48. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.js
  49. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxml
  50. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxss
  51. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.js
  52. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.wxml
  53. 1 1
      unpackage/dist/build/mp-weixin/pageA/payorder.wxss
  54. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.js
  55. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxml
  56. 0 0
      unpackage/dist/build/mp-weixin/pageA/rule/rule.js
  57. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.js
  58. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.wxml
  59. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoplist.js
  60. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoplist.wxml
  61. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoptype.js
  62. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.js
  63. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.wxml
  64. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js
  65. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml
  66. 0 0
      unpackage/dist/build/mp-weixin/pageB/Senderinfor.js
  67. 1 1
      unpackage/dist/build/mp-weixin/pageB/Senderinfor.wxml
  68. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.js
  69. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.wxml
  70. 1 1
      unpackage/dist/build/mp-weixin/pageB/citychange.js
  71. 0 0
      unpackage/dist/build/mp-weixin/pageB/delivery.js
  72. 0 0
      unpackage/dist/build/mp-weixin/pageB/delivery.wxml
  73. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.js
  74. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxml
  75. 0 0
      unpackage/dist/build/mp-weixin/pageB/expresstype.js
  76. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.js
  77. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.wxml
  78. 1 1
      unpackage/dist/build/mp-weixin/pageB/index.js
  79. 0 0
      unpackage/dist/build/mp-weixin/pageB/list/list.js
  80. 0 0
      unpackage/dist/build/mp-weixin/pageB/myPackage.js
  81. 0 0
      unpackage/dist/build/mp-weixin/pageB/myPackage.wxml
  82. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.js
  83. 1 1
      unpackage/dist/build/mp-weixin/pageB/parcel.js
  84. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.js
  85. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml
  86. 0 0
      unpackage/dist/build/mp-weixin/pageB/search.js
  87. 0 0
      unpackage/dist/build/mp-weixin/pageB/search.wxml
  88. 0 0
      unpackage/dist/build/mp-weixin/pageC/accountBalance/accountBalance.js
  89. 1 1
      unpackage/dist/build/mp-weixin/pageC/accountCancellation/accountCancellation.js
  90. 1 1
      unpackage/dist/build/mp-weixin/pageC/accountSecurity/accountSecurity.js
  91. 2 2
      unpackage/dist/build/mp-weixin/pageC/accountSecurity/component/textRight.js
  92. 1 1
      unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.js
  93. 0 0
      unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.js
  94. 0 0
      unpackage/dist/build/mp-weixin/pageC/addEditAddress/component/selectCity.js
  95. 0 0
      unpackage/dist/build/mp-weixin/pageC/addressManagement/addressManagement.js
  96. 2 2
      unpackage/dist/build/mp-weixin/pageC/addressManagement/component/address.js
  97. 0 0
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.js
  98. 0 0
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.wxml
  99. 0 0
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.wxss
  100. 2 2
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/component/reasonPopup.js

+ 1 - 1
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "kjds",
-    "appid" : "__UNI__AF78173",
+    "appid" : "__UNI__F715804",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

+ 1213 - 989
pageA/order.vue

@@ -1,1043 +1,1267 @@
 <template>
-	<view class="back">
-		<!-- 地址 -->
-		<view class="address" @click="toadd">
-			<view class="u-flex u-row-between">
-				<view class="add" v-if="addinfo">{{addinfo.full_address}}</view>
-				<view class="" v-else>{{i18n.shippingaddress}}</view>
-				<u-icon name="arrow-right" size='16'></u-icon>
-			</view>
-			<view class="info" v-if="addinfo">
-				<text>{{addinfo.name}}</text>
-				<text style="margin-left: 20rpx;">{{replacePhoneToStar(addinfo.mobile)}}</text>
-			</view>
-		</view>
-		<!-- 商品 -->
-		<view class="shop">
-			<view class="" v-if="typea=='shop'">
-				<view class="u-flex" style="margin-top: 32rpx;" v-for="(item,idx) in selelist" :key="idx">
-					<image :src="item.image" style="width: 184rpx;height: 184rpx;" mode=""></image>
-					<view class=" "
-						style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;flex:1">
-						<view class="">
-							<text class="toptitle">{{item.name_cn}}</text>
-							<view class="weight">{{item.sku_item[0].item}} </view>
-						</view>
-						<view class="u-flex u-row-between">
-							<view class="">
-								<text class="money">¥</text>
-								<text class="money" style="font-size: 34rpx;">{{item.sku_item[0].discount_price}}</text>
-							</view>
-							<view class=""> x {{item.cart.goods_num}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="" v-else>
-				<view class="">
-					<image :src="goodinfo.merchant.image" style="width: 38rpx;height: 38rpx;" mode=""></image>
-					<text class="name">{{goodinfo.merchant.merchant_name}}</text>
-				</view>
-				<view class="u-flex" style="margin-top: 32rpx;">
-					<image :src="sku_info.image" style="width: 184rpx;height: 184rpx;" mode=""></image>
-					<view class=" "
-						style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;flex:1">
-						<view class="">
-							<text class="toptitle">{{goodinfo.name_cn}}</text>
-							<view class="weight">{{sku_info.item}} </view>
-							<!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
-						</view>
-						<view class="u-flex u-row-between">
-							<view class="">
-								<text class="money">¥</text>
-								<text class="money"
-									style="font-size: 34rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*1000)*Number(value*1000))/1000000:(Number(sku_info.discount_price*1000)*Number(value)*1000)/1000000}}</text>
-							</view>
-							<u-number-box v-model="value">
-								<view slot="minus" class="">
-									<u-icon name="minus" size="12"></u-icon>
-								</view>
-								<input slot="input" v-model="value" style="width: 40px;text-align: center;"
-									class="input"></input>
-								<view slot="plus" class="">
-									<u-icon name="plus" size="12"></u-icon>
-								</view>
-							</u-number-box>
-						</view>
-					</view>
-				</view>
-			</view>
-
-		</view>
-		<!-- 物流 -->
-		<view class="logistics u-flex u-row-between">
-			<text style="font-weight: 600;width: 320rpx;">{{i18n.flow}}</text>
-			<view class="u-flex" @click="show = true">
-				<text class="change">{{containname1?type1+' | '+containname1 :i18n.selection}}</text>
-				<u-icon name="arrow-right" size='16'></u-icon>
-			</view>
-		</view>
-		<!-- 推荐 -->
-		<view class="recommend">
-			<view class="top">
-				<image src="static/images/recommend.png" style="width: 124rpx;height: 30rpx;" mode=""></image>
-			</view>
-			<view class="bottom">
-				<scroll-view scroll-x class="u-flex" style="column: gap 28rpx; display: flex;">
-					<view class="u-flex" style="column-gap: 16rpx; ">
-						<view class="" v-for="(item,idx) in swiptlist" :key="idx" @click="todetail(item.id)">
-							<image :src="item.image" style="width: 156rpx;height: 156rpx;" mode="">
-							</image>
-							<view class="title" v-if="language =='zh-CN'">
-								{{item.name_cn}}
-							</view>
-							<view class="title" v-if="language =='en-US'">
-								{{item.name_en}}
-							</view>
-							<view class="title" v-if="language =='es-ES'">
-								{{item.name_es}}
-							</view>
-							<view class="title" v-if="language =='it-IT'">
-								{{item.name_ita}}
-							</view>
-							<view class="money" style="color: #F83224;font-size: 20rpx;">
-								<text>¥</text>
-								<text
-									style="font-size: 28rpx;">{{item.is_discount==0?item.discount_price.slice(0,-3):item.price.slice(0,-3)}}</text>
-								<text>{{item.is_discount==0?item.discount_price.slice(-3):item.price.slice(-3)}}</text>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<!-- 商品相关 -->
-		<view class="abount" style="margin-top: 20rpx;">
-			<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
-				<view class="name">{{i18n.Commodityamount}}</view>
-				<view class="" v-if="typea=='shop'">{{goodsPrice}}</view>
-				<view class="money" v-else>
-					¥{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}
-				</view>
-			</view>
-			<view class="u-flex u-row-between" v-show="containname1">
-				<view class="name">{{i18n.Grosscommodityweight}}</view>
-<!-- 				<view class="money" v-if="typea=='shop'">{{
+  <view class="back">
+    <!-- 地址 -->
+    <view class="address" @click="toadd">
+      <view class="u-flex u-row-between">
+        <view class="add" v-if="addinfo">{{ addinfo.full_address }}</view>
+        <view class="" v-else>{{ i18n.shippingaddress }}</view>
+        <u-icon name="arrow-right" size="16"></u-icon>
+      </view>
+      <view class="info" v-if="addinfo">
+        <text>{{ addinfo.name }}</text>
+        <text style="margin-left: 20rpx">{{
+          replacePhoneToStar(addinfo.mobile)
+        }}</text>
+      </view>
+    </view>
+    <!-- 商品 -->
+    <view class="shop">
+      <view class="" v-if="typea == 'shop'">
+        <view
+          class="u-flex"
+          style="margin-top: 32rpx"
+          v-for="(item, idx) in selelist"
+          :key="idx"
+        >
+          <image
+            :src="item.image"
+            style="width: 184rpx; height: 184rpx"
+            mode=""
+          ></image>
+          <view
+            class=" "
+            style="
+              margin-left: 20rpx;
+              flex-direction: column;
+              justify-content: space-between;
+              height: 184rpx;
+              display: flex;
+              flex: 1;
+            "
+          >
+            <view class="">
+              <text class="toptitle">{{ item.name_cn }}</text>
+              <view class="weight">{{ item.sku_item[0].item }} </view>
+            </view>
+            <view class="u-flex u-row-between">
+              <view class="">
+                <text class="money">¥</text>
+                <text class="money" style="font-size: 34rpx">{{
+                  item.sku_item[0].discount_price
+                }}</text>
+              </view>
+              <view class=""> x {{ item.cart.goods_num }}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="" v-else>
+        <view class="">
+          <image
+            :src="goodinfo.merchant.image"
+            style="width: 38rpx; height: 38rpx"
+            mode=""
+          ></image>
+          <text class="name">{{ goodinfo.merchant.merchant_name }}</text>
+        </view>
+        <view class="u-flex" style="margin-top: 32rpx">
+          <image
+            :src="sku_info.image"
+            style="width: 184rpx; height: 184rpx"
+            mode=""
+          ></image>
+          <view
+            class=" "
+            style="
+              margin-left: 20rpx;
+              flex-direction: column;
+              justify-content: space-between;
+              height: 184rpx;
+              display: flex;
+              flex: 1;
+            "
+          >
+            <view class="">
+              <text class="toptitle">{{ goodinfo.name_cn }}</text>
+              <view class="weight">{{ sku_info.item }} </view>
+              <!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
+            </view>
+            <view class="u-flex u-row-between">
+              <view class="">
+                <text class="money">¥</text>
+                <text class="money" style="font-size: 34rpx">{{
+                  goodinfo.is_discount == 1
+                    ? (Number(sku_info.price * 1000) * Number(value * 1000)) /
+                      1000000
+                    : (Number(sku_info.discount_price * 1000) *
+                        Number(value) *
+                        1000) /
+                      1000000
+                }}</text>
+              </view>
+              <u-number-box v-model="value">
+                <view slot="minus" class="">
+                  <u-icon name="minus" size="12"></u-icon>
+                </view>
+                <input
+                  slot="input"
+                  v-model="value"
+                  style="width: 40px; text-align: center"
+                  class="input"
+                />
+                <view slot="plus" class="">
+                  <u-icon name="plus" size="12"></u-icon>
+                </view>
+              </u-number-box>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- 物流 -->
+    <view class="logistics u-flex u-row-between">
+      <text style="font-weight: 600; width: 320rpx">{{ i18n.flow }}</text>
+      <view class="u-flex" @click="show = true">
+        <text class="change">{{
+          containname1 ? type1 + " | " + containname1 : i18n.selection
+        }}</text>
+        <u-icon name="arrow-right" size="16"></u-icon>
+      </view>
+    </view>
+    <!-- 推荐 -->
+    <view class="recommend">
+      <view class="top">
+        <image
+          src="static/images/recommend.png"
+          style="width: 124rpx; height: 30rpx"
+          mode=""
+        ></image>
+      </view>
+      <view class="bottom">
+        <scroll-view
+          scroll-x
+          class="u-flex"
+          style="column: gap 28rpx; display: flex"
+        >
+          <view class="u-flex" style="column-gap: 16rpx">
+            <view
+              class=""
+              v-for="(item, idx) in swiptlist"
+              :key="idx"
+              @click="todetail(item.id)"
+            >
+              <image
+                :src="item.image"
+                style="width: 156rpx; height: 156rpx"
+                mode=""
+              >
+              </image>
+              <view class="title" v-if="language == 'zh-CN'">
+                {{ item.name_cn }}
+              </view>
+              <view class="title" v-if="language == 'en-US'">
+                {{ item.name_en }}
+              </view>
+              <view class="title" v-if="language == 'es-ES'">
+                {{ item.name_es }}
+              </view>
+              <view class="title" v-if="language == 'it-IT'">
+                {{ item.name_ita }}
+              </view>
+              <view class="money" style="color: #f83224; font-size: 20rpx">
+                <text>¥</text>
+                <text style="font-size: 28rpx">{{
+                  item.is_discount == 0
+                    ? item.discount_price.slice(0, -3)
+                    : item.price.slice(0, -3)
+                }}</text>
+                <text>{{
+                  item.is_discount == 0
+                    ? item.discount_price.slice(-3)
+                    : item.price.slice(-3)
+                }}</text>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+    <!-- 商品相关 -->
+    <view class="abount" style="margin-top: 20rpx">
+      <view class="u-flex u-row-between" style="margin-bottom: 40rpx">
+        <view class="name">{{ i18n.Commodityamount }}</view>
+        <view class="" v-if="typea == 'shop'">{{ goodsPrice }}</view>
+        <view class="money" v-else>
+          ¥{{
+            goodinfo.is_discount == 1
+              ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
+              : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
+                10000
+          }}
+        </view>
+      </view>
+      <view class="u-flex u-row-between" v-show="containname1">
+        <view class="name">{{ i18n.Grosscommodityweight }}</view>
+        <!-- 				<view class="money" v-if="typea=='shop'">{{
 					goodsWeight
 				}}kg</view> -->
-				<!-- <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view> -->
-				<view class="money" >{{weight_total}}</view>
-			</view>
-			<view class="back u-flex" v-if="containname1">
-				<image src="static/images/warning.png" style="width: 32rpx;height: 32rpx;" mode=""></image>
-				<text
-					style="margin-left: 12rpx;font-size: 24rpx;">{{i18n.buy}}{{max_weight}}kg{{i18n.price}}¥{{unit_fee}},{{i18n.morefavorable}}</text>
-			</view>
-			<view class="u-flex u-row-between" style='margin-bottom:40rpx;margin-top: 20rpx;'>
-				<view class="name">{{i18n.Costperkilogram}}</view>
-				<view class="money">{{containname1?unit_price:i18n.shippingmethod}}</view>
-			</view>
-			<view class="u-flex u-row-between">
-				<view class="name">{{i18n.freight}}</view>
-				<view class="money">{{containname1?sum:i18n.shippingmethod}}</view>
-			</view>
-			<view class="zong u-flex u-row-right">
-				<view class="">
-					<text class="small">{{i18n.subtotal}}</text>
-					<text class="mon">¥</text>
-					<text class="mon" v-if="typea=='shop'">{{goodsPrice}}</text>
-					<text class="mon" v-else
-						style="font-size: 40rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}</text>
-				</view>
-			</view>
-		</view>
-		<view class="" style="height: 166rpx;"></view>
-		<view class="btn u-flex u-row-right">
-			<view class="u-flex">
-<!-- 				<text v-if="typea == 'shop'">{{i18n.Atotalof}}{{goodsWeight}}kg,</text>
+        <!-- <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view> -->
+        <view class="money">{{ weight_total }}</view>
+      </view>
+      <view class="back u-flex" v-if="containname1">
+        <image
+          src="static/images/warning.png"
+          style="width: 32rpx; height: 32rpx"
+          mode=""
+        ></image>
+        <text style="margin-left: 12rpx; font-size: 24rpx"
+          >{{ i18n.buy }}{{ max_weight }}kg{{ i18n.price }}¥{{ unit_fee }},{{
+            i18n.morefavorable
+          }}</text
+        >
+      </view>
+      <view
+        class="u-flex u-row-between"
+        style="margin-bottom: 40rpx; margin-top: 20rpx"
+      >
+        <view class="name">{{ i18n.Costperkilogram }}</view>
+        <view class="money">{{
+          containname1 ? unit_price : i18n.shippingmethod
+        }}</view>
+      </view>
+      <view class="u-flex u-row-between">
+        <view class="name">{{ i18n.freight }}</view>
+        <view class="money">{{
+          containname1 ? sum : i18n.shippingmethod
+        }}</view>
+      </view>
+      <view class="zong u-flex u-row-right">
+        <view class="">
+          <text class="small">{{ i18n.subtotal }}</text>
+          <text class="mon">¥</text>
+          <text class="mon" v-if="typea == 'shop'">{{ goodsPrice }}</text>
+          <text class="mon" v-else style="font-size: 40rpx">{{
+            goodinfo.is_discount == 1
+              ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
+              : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
+                10000
+          }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="" style="height: 166rpx"></view>
+    <view class="btn u-flex u-row-right">
+      <view class="u-flex">
+        <!-- 				<text v-if="typea == 'shop'">{{i18n.Atotalof}}{{goodsWeight}}kg,</text>
 				<text v-else class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text> -->
-				<text  class="kg" v-show="containname1">{{i18n.Atotalof}}{{weight_total}}kg,</text>
-				<text>{{i18n.total}}:</text>
-				<text class="money" style="font-size: 28rpx;">¥</text>
-				<text style="font-weight: bold;" class="money"
-					v-if="typea=='shop'">{{(Number(sum*10000+ Number(goodsPrice)*10000))/10000 }}</text>
-				<view class="" v-else>
-					<text class="money" v-if="goodinfo.is_discount==1"
-						style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.price)*Number(value)*10000))/10000}}</text>
-					<text class="money" v-if="goodinfo.is_discount==0"
-						style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.discount_price)*Number(value)*10000))/10000}}</text>
-				</view>
-			</view>
-			<view class="order" @click="topay">
-				{{i18n.Submitorder}}
-			</view>
-		</view>
-		<!-- 跨境物流 -->
-		<u-popup :show="show" @close="close" mode="bottom" closeIconPos='top-right' round='28'>
-			<view style="padding: 40rpx 28rpx;box-sizing:border-box;">
-				<view class="u-flex u-row-between">
-					<view class="" style="width: 28px;height: 28px;"></view>
-					<view class="poptitle">
-						{{i18n.flow}}
-					</view>
-					<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
-				</view>
-				<view class="u-flex " style="margin-top: 60rpx;flex-wrap: wrap;column-gap: 16rpx;">
-					<view :class="index==idx?'active':'unactive'" v-for="(item,idx) in containerList"
-						@click="change(item,idx)"
-						style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-bottom: 28rpx;position: relative;">
-						<image v-if="index==idx" src="static/images/change.png"
-							style="width: 36rpx;height: 32rpx;position: absolute;top: 0;right: 0;" mode=""></image>
-						<view class="logname" v-if="language =='zh-CN'">{{item.name_cn}}</view>
-						<view class="logname" v-if="language =='en-US'">{{item.name_en}}</view>
-						<view class="logname" v-if="language =='es-ES'">{{item.name_es}}</view>
-						<view class="logname" v-if="language =='it-IT'">{{item.name_ita}}</view>
-						<!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
-						<view class="wei" style="font-size: 32rpx;font-weight: 600;">¥{{item.unit_price}}/kg</view>
-					</view>
-				</view>
-				<view class="nextto" @click="next">{{i18n.next}}</view>
-			</view>
-		</u-popup>
-		<!-- 跨境物流下一步 -->
-		<u-popup :safeAreaInsetTop='true' :show="show1" @close="close" mode="bottom" closeIconPos='top-right' round='28'
-			bgColor='#F4F4F4'>
-			<view style="padding: 40rpx 28rpx;box-sizing:border-box;position: relative;">
-				<view class="u-flex u-row-between">
-					<view class="" style="width: 28px;height: 28px;"></view>
-					<view class="poptitle">
-						{{i18n.flow}}
-					</view>
-					<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
-				</view>
-				<scroll-view :scroll-y="true" style="500rpx">
-					<view class="transport" style="margin-top: 32rpx;" @click="activea(item,idx)"
-						v-for="(item,idx) in containlist" v-if="item.sum != 0">
-						<view class="u-flex u-row-between">
-							<text class="yundate">{{i18n.Shipmentdate}} {{item.end_date}}</text>
-							<image v-if="datechan==idx" src="/pageA/static/images/active.png"
-								style="width: 36rpx;height: 36rpx;" mode=""></image>
-							<image v-else src="/pageA/static/images/unactive.png" style="width: 36rpx;height: 36rpx;"
-								mode=""></image>
-						</view>
-						<view class="u-flex u-row-between" style="margin-top: 28rpx;">
-							<view class="chest">
-								<text v-if="language =='zh-CN'">{{item.name_cn}}</text>
-								<text v-if="language =='en-US'">{{item.name_en}}</text>
-								<text v-if="language =='es-ES'">{{item.name_es}}</text>
-								<text v-if="language =='it-IT'">{{item.name_ita}}</text>
-								<text style="margin: 0 16rpx;">|</text>
-								<text>{{i18n.Estimatedtimeofarrival}}{{item.transport_days}}{{i18n.Workingday}}</text>
-							</view>
-							<view class="mone">
-								<text>¥</text>
-								<text style="font-size: 48rpx;font-weight: 600;">{{item.sum}}</text>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-				<view class="" style="height: 166rpx;"></view>
-				<view class="enbottom  u-flex u-row-between">
-					<view class="cancel" @click="close">{{i18n.Cancel}}</view>
-					<view class="confirm" @click="confirm">{{i18n.enter}}</view>
-				</view>
-			</view>
-		</u-popup>
-	</view>
+        <text class="kg" v-show="containname1"
+          >{{ i18n.Atotalof }}{{ weight_total }}kg,</text
+        >
+        <text>{{ i18n.total }}:</text>
+        <text class="money" style="font-size: 28rpx">¥</text>
+        <text style="font-weight: bold" class="money" v-if="typea == 'shop'">{{
+          Number(sum * 10000 + Number(goodsPrice) * 10000) / 10000
+        }}</text>
+        <view class="" v-else>
+          <text
+            class="money"
+            v-if="goodinfo.is_discount == 1"
+            style="font-weight: bold"
+            >{{
+              Number(
+                sum * 10000 + Number(sku_info.price) * Number(value) * 10000
+              ) / 10000
+            }}</text
+          >
+          <text
+            class="money"
+            v-if="goodinfo.is_discount == 0"
+            style="font-weight: bold"
+            >{{
+              Number(
+                sum * 10000 +
+                  Number(sku_info.discount_price) * Number(value) * 10000
+              ) / 10000
+            }}</text
+          >
+        </view>
+      </view>
+      <view class="order" @click="topay">
+        {{ i18n.Submitorder }}
+      </view>
+    </view>
+    <!-- 跨境物流 -->
+    <u-popup
+      :show="show"
+      @close="close"
+      mode="bottom"
+      closeIconPos="top-right"
+      round="28"
+    >
+      <view style="padding: 40rpx 28rpx; box-sizing: border-box">
+        <view class="u-flex u-row-between">
+          <view class="" style="width: 28px; height: 28px"></view>
+          <view class="poptitle">
+            {{ i18n.flow }}
+          </view>
+          <u-icon
+            name="close"
+            @click="close"
+            color="background: #333333;"
+            size="28"
+          ></u-icon>
+        </view>
+        <view
+          class="u-flex"
+          style="margin-top: 60rpx; flex-wrap: wrap; column-gap: 16rpx"
+        >
+          <view
+            :class="index == idx ? 'active' : 'unactive'"
+            v-for="(item, idx) in containerList"
+            @click="change(item, idx)"
+            style="
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              justify-content: center;
+              margin-bottom: 28rpx;
+              position: relative;
+            "
+          >
+            <image
+              v-if="index == idx"
+              src="static/images/change.png"
+              style="
+                width: 36rpx;
+                height: 32rpx;
+                position: absolute;
+                top: 0;
+                right: 0;
+              "
+              mode=""
+            ></image>
+            <view class="logname" v-if="language == 'zh-CN'">{{
+              item.name_cn
+            }}</view>
+            <view class="logname" v-if="language == 'en-US'">{{
+              item.name_en
+            }}</view>
+            <view class="logname" v-if="language == 'es-ES'">{{
+              item.name_es
+            }}</view>
+            <view class="logname" v-if="language == 'it-IT'">{{
+              item.name_ita
+            }}</view>
+            <!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
+            <view class="wei" style="font-size: 32rpx; font-weight: 600"
+              >¥{{ item.unit_price }}/kg</view
+            >
+          </view>
+        </view>
+        <view class="nextto" @click="next">{{ i18n.next }}</view>
+      </view>
+    </u-popup>
+    <!-- 跨境物流下一步 -->
+    <u-popup
+      :safeAreaInsetTop="true"
+      :show="show1"
+      @close="close"
+      mode="bottom"
+      closeIconPos="top-right"
+      round="28"
+      bgColor="#F4F4F4"
+    >
+      <view
+        style="padding: 40rpx 28rpx; box-sizing: border-box; position: relative"
+      >
+        <view class="u-flex u-row-between">
+          <view class="" style="width: 28px; height: 28px"></view>
+          <view class="poptitle">
+            {{ i18n.flow }}
+          </view>
+          <u-icon
+            name="close"
+            @click="close"
+            color="background: #333333;"
+            size="28"
+          ></u-icon>
+        </view>
+        <scroll-view :scroll-y="true" style="500rpx">
+          <view
+            class="transport"
+            style="margin-top: 32rpx"
+            @click="activea(item, idx)"
+            v-for="(item, idx) in containlist"
+            v-if="item.sum != 0"
+          >
+            <view class="u-flex u-row-between">
+              <text class="yundate"
+                >{{ i18n.Shipmentdate }} {{ item.end_date }}</text
+              >
+              <image
+                v-if="datechan == idx"
+                src="/pageA/static/images/active.png"
+                style="width: 36rpx; height: 36rpx"
+                mode=""
+              ></image>
+              <image
+                v-else
+                src="/pageA/static/images/unactive.png"
+                style="width: 36rpx; height: 36rpx"
+                mode=""
+              ></image>
+            </view>
+            <view class="u-flex u-row-between" style="margin-top: 28rpx">
+              <view class="chest">
+                <text v-if="language == 'zh-CN'">{{ item.name_cn }}</text>
+                <text v-if="language == 'en-US'">{{ item.name_en }}</text>
+                <text v-if="language == 'es-ES'">{{ item.name_es }}</text>
+                <text v-if="language == 'it-IT'">{{ item.name_ita }}</text>
+                <text style="margin: 0 16rpx">|</text>
+                <text
+                  >{{ i18n.Estimatedtimeofarrival }}{{ item.transport_days
+                  }}{{ i18n.Workingday }}</text
+                >
+              </view>
+              <view class="mone">
+                <text>¥</text>
+                <text style="font-size: 48rpx; font-weight: 600">{{
+                  item.sum
+                }}</text>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+        <view class="" style="height: 166rpx"></view>
+        <view class="enbottom u-flex u-row-between">
+          <view class="cancel" @click="close">{{ i18n.Cancel }}</view>
+          <view class="confirm" @click="confirm">{{ i18n.enter }}</view>
+        </view>
+      </view>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				value: 1,
-				show: false,
-				index: '',
-				show1: false,
-				datechan: '',
-				sku_info: {},
-				goodinfo: {},
-				swiptlist: [], //推荐列表
-				language: 'zh-CN',
-				containerList: [], //列表
-				province_id: '',
-				transport_type_id: '',
-				containlist: [],
-				containid: '', //货柜id
-				containname: '', //货柜名称
-				type: '', //货运方式名称
-				containname1: '',
-				type1: '',
-				sum: '',
-				unit_price: '',
-				recommend_weight: '',
-				sum1: '',
-				unit_price1: '',
-				recommend_weight1: '',
-				max_weight: '',
-				min_weight: '',
-				unit_fee: '',
-				addinfo: '',
-				huoid: '',
-				selelist: [],
-				typea: '',
-				goodsPrice: '',
-				goodsWeight: '',
-				stringcheck: '',
-				cartid: '',
-				weight_total:''
-			};
-		},
-		computed: {
-			i18n() {
-				return this.$t('index')
-			},
-		},
-		onLoad(options) {
-			// url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
-			if (options.typea) {
-				console.log(22222);
-				this.typea = options.typea
-				this.selelist = JSON.parse(decodeURIComponent(options.selelist))
-				this.goodsPrice = options.goodsPrice
-				this.goodsWeight = options.goodsWeight
-				this.stringcheck = options.stringcheck
-				this.cartid = options.cartid
-			} else if (options) {
-				this.value = options.value
-				this.sku_info = JSON.parse(decodeURIComponent(options.sku));
-				this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo))
-				if (options.share_merchant_id) {
-					this.share_merchant_id = options.share_merchant_id
-				}
-			}
-		},
-		onShow() {
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
-			this.recommend()
-			// this.container()
-		},
-		methods: {
-			todetail(id) {
-				uni.navigateTo({
-					url: '/pageA/productdetails?id=' + id
-				})
-			},
-			//正则匹配手机号
-			replacePhoneToStar: function(phone) {
-				if (phone) {
-					return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
-				}
-			},
-			//推荐重量
-			recommendweight() {
-				uni.$u.http.get('/api/express-order/recommend-container', {
-					params: {
-						container_id: this.containid,
-						type: this.goodinfo.cate == 0 ? 'normal' : 'special'
-					}
-				}).then((res) => {
-					console.log(res);
-					this.max_weight = res.max_weight
-					this.min_weight = res.min_weight
-					this.unit_fee = res.unit_fee
-				}).catch(() => {
-
-				})
-			},
-			//货运类型列表
-			transport() {
-				uni.$u.http.get('/api/transport-type', {
-					params: {
-						province_id: this.province_id,
-					}
-				}).then((res) => {
-					this.containerList = res
-					this.transport_type_id = res[0].id
-					if (this.language == 'zh-CN') {
-						this.type = res[0].name_cn
-					}
-					if (this.language == 'en-US') {
-						this.type = res[0].name_en
-					}
-					if (this.language == 'es-ES') {
-						this.type = res[0].name_es
-					}
-					if (this.language == 'it-IT') {
-						this.type = res[0].name_ita
-					}
-				}).catch(() => {
-
-				})
-			},
-			//跳转到填写地址
-			toadd() {
-				var that = this
-				uni.navigateTo({
-					url: '/pageC/addressManagement/addressManagement?tabs=' + Number(0),
-					events: {
-						getadd(res) {
-							that.addinfo = res
-							that.province_id = res.province_id
-							that.transport()
-						}
-					}
-				})   
-			},
-			//货柜列表
-			container() {
-				this.containlist = []
-				uni.$u.http.get('/api/container-base', {
-					params: {
-						is_page: 0,
-						province_id: this.province_id,
-						transport_type_id: this.transport_type_id,
-						weight: this.typea == 'shop' ?
-							'': Number(this.sku_info.weight) * this.value,
-						type: this.typea == 'shop' ? '' : (this.goodinfo.cate == 0 ? 'normal' : 'special'),
-						length: this.typea == 'shop' ?
-							'': Number(this.sku_info.length) * this.value, //		是	String	长
-						width: this.sku_info.width, //		是	String	宽
-						height: this.sku_info.height, //		是	String	高
-						cart_id: this.cartid
-						// cart_id: '147,148'
-					}
-				}).then((res) => {
-					res.forEach((item) => {
-						if (item.sum != 0) {
-							this.containlist.push(item)
-						}
-						console.log(this.containlist);
-					})
-					if (this.cartid.length == 0 && this.typea == 'shop') {
-						console.log('his.cartid.length', this.cartid.length);
-						this.sum = 0
-					}
-					// this.sum = this.containlist[0].sum
-					// this.unit_price = this.containlist[0].unit_price
-					if (this.goodinfo.is_shipping == 0) {
-						this.sum = 0
-					} else {
-						this.sum = this.containlist[0].sum
-					}
-					if (this.goodinfo.is_shipping == 0) {
-						this.unit_price = 0
-					} else {
-						this.unit_price = this.containlist[0].unit_price
-					}
-					this.recommend_weight = this.containlist[0].recommend_weight
-					this.weight_total = this.containlist[0].weight_total
-					this.containid = this.containlist[0].id
-					if (this.language == 'zh-CN') {
-						this.containname = this.containlist[0].name_cn
-					}
-					if (this.language == 'en-US') {
-						this.containname = this.containlist[0].name_en
-					}
-					if (this.language == 'es-ES') {
-						this.containname = this.containlist[0].name_es
-					}
-					if (this.language == 'it-IT') {
-						this.containname = this.containlist[0].name_ita
-					}
-					
-				}).catch(() => {
-
-				})
-			},
-			//运费满减
-			config() {
-				var that = this
-				uni.$u.http.get('/api/config', {
-					params: {
-						module: 'free_shipping'
-					}
-				}).then((res) => {
-					if (Number(that.goodsPrice) > res.free_shipping && that.typea == 'shop') {
-						console.log('goodsPrice', that.goodsPrice);
-						console.log('res.free_shipping', res.free_shipping);
-						that.sum = 0;
-						that.unit_price = 0;
-					}
-					let goodsum = ''
-					if (that.goodinfo.is_discount == 1) {
-						goodsum = Number(that.sku_info.price * 100) * Number(that.value * 100) / 10000
-						console.log('that.sum', that.sum);
-						console.log('that.goodsum', goodsum);
-						if (goodsum > res.free_shipping) {
-							that.sum = 0;
-							that.unit_price = 0;
-						}
-					} else {
-						goodsum = Number(that.sku_info.discount_price * 100) * Number(that.value * 100) / 10000
-						if (goodsum > res.free_shipping) {
-							that.sum = 0
-							that.unit_price = 0
-						}
-					}
-				}).catch(() => {
-
-				})
-			},
-			//商品推荐
-			recommend() {
-				uni.$u.http.post('/api/goods/recommend', {
-					keyword: ''
-				}).then((res) => {
-					this.swiptlist = res
-				}).catch(() => {
-
-				})
-			},
-			change(item, index) {
-				this.transport_type_id = item.id
-				this.index = index
-				if (this.language == 'zh-CN') {
-					this.type = item.name_cn
-				}
-				if (this.language == 'en-US') {
-					this.type = item.name_en
-				}
-				if (this.language == 'es-ES') {
-					this.type = item.name_es
-				}
-				if (this.language == 'it-IT') {
-					this.type = item.name_ita
-				}
-			},
-			next() {
-				this.show = false
-				this.show1 = true
-				this.type1 = this.type
-				this.container()
-			},
-			activea(item, idx) {
-				this.datechan = idx
-				this.sum = item.sum
-				this.unit_price = item.unit_price
-				this.recommend_weight = item.recommend_weight
-				this.containid = item.id
-				this.weight_total = item.weight_total
-				if (this.language == 'zh-CN') {
-					this.containname = item.name_cn
-				}
-				if (this.language == 'en-US') {
-					this.containname = item.name_en
-				}
-				if (this.language == 'es-ES') {
-					this.containname = item.name_es
-				}
-				if (this.language == 'it-IT') {
-					this.containname = item.name_ita
-				}
-			},
-			//确定
-			confirm() {
-				this.show1 = false
-				this.containname1 = this.containname
-				this.recommendweight()
-				this.config()
-			},
-			// 取消
-			close() {
-				this.show = false
-				this.show1 = false
-			},
-			//提交订单
-			topay() {
-				uni.$u.http.post('/api/order', {
-					address_id: this.addinfo.id, //3	是	String	地址ID
-					goods_id: this.goodinfo.id, //65	是	String	商品id
-					goods_num: this.value, //2	是	String	商品数量
-					sku_item_id: this.sku_info.id, //60	是	String	规格id
-					cart_ids: this.stringcheck, //8,9	是	String	购物车id
-					remark: '', //备注	是	String	备注
-					merchant_goods_id: this.goodinfo.merchant_goods_id || '', //39	是	String	团长商品id
-					container_id: this.containid, //1	是	String	货柜id
-					share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
-					belong: this.goodinfo.source || '' //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
-				}).then((res) => {
-					console.log('share_merchant_id', this.share_merchant_id);
-					console.log(res);
-					uni.navigateTo({
-						// url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
-						url: '/pageA/payorder?orderid=' + res.id + '&sum=' + res.amount
-					})
-				}).catch(() => {})
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      value: 1,
+      show: false,
+      index: "",
+      show1: false,
+      datechan: "",
+      sku_info: {},
+      goodinfo: {},
+      swiptlist: [], //推荐列表
+      language: "zh-CN",
+      containerList: [], //列表
+      province_id: "",
+      transport_type_id: "",
+      containlist: [],
+      containid: "", //货柜id
+      containname: "", //货柜名称
+      type: "", //货运方式名称
+      containname1: "",
+      type1: "",
+      sum: "",
+      unit_price: "",
+      recommend_weight: "",
+      sum1: "",
+      unit_price1: "",
+      recommend_weight1: "",
+      max_weight: "",
+      min_weight: "",
+      unit_fee: "",
+      addinfo: "",
+      huoid: "",
+      selelist: [],
+      typea: "",
+      goodsPrice: "",
+      goodsWeight: "",
+      stringcheck: "",
+      cartid: "",
+      weight_total: "",
+    };
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  onLoad(options) {
+    // url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
+    if (options.typea) {
+      console.log(22222);
+      this.typea = options.typea;
+      this.selelist = JSON.parse(decodeURIComponent(options.selelist));
+      this.goodsPrice = options.goodsPrice;
+      this.goodsWeight = options.goodsWeight;
+      this.stringcheck = options.stringcheck;
+      this.cartid = options.cartid;
+    } else if (options) {
+      this.value = options.value;
+      this.sku_info = JSON.parse(decodeURIComponent(options.sku));
+      this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo));
+      if (options.share_merchant_id) {
+        this.share_merchant_id = options.share_merchant_id;
+      }
+    }
+  },
+  onShow() {
+    if (uni.getStorageSync("language") != "") {
+      this.language = uni.getStorageSync("language");
+    }
+    this.recommend();
+    // this.container()
+  },
+  methods: {
+    todetail(id) {
+      uni.navigateTo({
+        url: "/pageA/productdetails?id=" + id,
+      });
+    },
+    //正则匹配手机号
+    replacePhoneToStar: function (phone) {
+      if (phone) {
+        return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
+      }
+    },
+    //推荐重量
+    recommendweight() {
+      uni.$u.http
+        .get("/api/express-order/recommend-container", {
+          params: {
+            container_id: this.containid,
+            type: this.goodinfo.cate == 0 ? "normal" : "special",
+          },
+        })
+        .then((res) => {
+          console.log(res);
+          this.max_weight = res.max_weight;
+          this.min_weight = res.min_weight;
+          this.unit_fee = res.unit_fee;
+        })
+        .catch(() => {});
+    },
+    //货运类型列表
+    transport() {
+      uni.$u.http
+        .get("/api/transport-type", {
+          params: {
+            province_id: this.province_id,
+          },
+        })
+        .then((res) => {
+          this.containerList = res;
+          this.transport_type_id = res[0].id;
+          if (this.language == "zh-CN") {
+            this.type = res[0].name_cn;
+          }
+          if (this.language == "en-US") {
+            this.type = res[0].name_en;
+          }
+          if (this.language == "es-ES") {
+            this.type = res[0].name_es;
+          }
+          if (this.language == "it-IT") {
+            this.type = res[0].name_ita;
+          }
+        })
+        .catch(() => {});
+    },
+    //跳转到填写地址
+    toadd() {
+      var that = this;
+      uni.navigateTo({
+        url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
+        events: {
+          getadd(res) {
+            that.addinfo = res;
+            that.province_id = res.province_id;
+            that.transport();
+          },
+        },
+      });
+    },
+    //货柜列表
+    container() {
+      this.containlist = [];
+      uni.$u.http
+        .get("/api/container-base", {
+          params: {
+            is_page: 0,
+            province_id: this.province_id,
+            transport_type_id: this.transport_type_id,
+            weight:
+              this.typea == "shop"
+                ? ""
+                : Number(this.sku_info.weight) * this.value,
+            type:
+              this.typea == "shop"
+                ? ""
+                : this.goodinfo.cate == 0
+                ? "normal"
+                : "special",
+            length:
+              this.typea == "shop"
+                ? ""
+                : Number(this.sku_info.length) * this.value, //		是	String	长
+            width: this.sku_info.width, //		是	String	宽
+            height: this.sku_info.height, //		是	String	高
+            cart_id: this.cartid,
+            // cart_id: '147,148'
+          },
+        })
+        .then((res) => {
+          res.forEach((item) => {
+            if (item.sum != 0) {
+              this.containlist.push(item);
+            }
+            console.log(this.containlist);
+          });
+          if (this.cartid.length == 0 && this.typea == "shop") {
+            console.log("his.cartid.length", this.cartid.length);
+            this.sum = 0;
+          }
+          // this.sum = this.containlist[0].sum
+          // this.unit_price = this.containlist[0].unit_price
+          if (this.goodinfo.is_shipping == 0) {
+            this.sum = 0;
+          } else {
+            this.sum = this.containlist[0].sum;
+          }
+          if (this.goodinfo.is_shipping == 0) {
+            this.unit_price = 0;
+          } else {
+            this.unit_price = this.containlist[0].unit_price;
+          }
+          this.recommend_weight = this.containlist[0].recommend_weight;
+          this.weight_total = this.containlist[0].weight_total;
+          this.containid = this.containlist[0].id;
+          if (this.language == "zh-CN") {
+            this.containname = this.containlist[0].name_cn;
+          }
+          if (this.language == "en-US") {
+            this.containname = this.containlist[0].name_en;
+          }
+          if (this.language == "es-ES") {
+            this.containname = this.containlist[0].name_es;
+          }
+          if (this.language == "it-IT") {
+            this.containname = this.containlist[0].name_ita;
+          }
+        })
+        .catch(() => {});
+    },
+    //运费满减
+    config() {
+      var that = this;
+      uni.$u.http
+        .get("/api/config", {
+          params: {
+            module: "free_shipping",
+          },
+        })
+        .then((res) => {
+          if (
+            Number(that.goodsPrice) > res.free_shipping &&
+            that.typea == "shop"
+          ) {
+            console.log("goodsPrice", that.goodsPrice);
+            console.log("res.free_shipping", res.free_shipping);
+            that.sum = 0;
+            that.unit_price = 0;
+          }
+          let goodsum = "";
+          if (that.goodinfo.is_discount == 1) {
+            goodsum =
+              (Number(that.sku_info.price * 100) * Number(that.value * 100)) /
+              10000;
+            console.log("that.sum", that.sum);
+            console.log("that.goodsum", goodsum);
+            if (goodsum > res.free_shipping) {
+              that.sum = 0;
+              that.unit_price = 0;
+            }
+          } else {
+            goodsum =
+              (Number(that.sku_info.discount_price * 100) *
+                Number(that.value * 100)) /
+              10000;
+            if (goodsum > res.free_shipping) {
+              that.sum = 0;
+              that.unit_price = 0;
+            }
+          }
+        })
+        .catch(() => {});
+    },
+    //商品推荐
+    recommend() {
+      uni.$u.http
+        .post("/api/goods/recommend", {
+          keyword: "",
+        })
+        .then((res) => {
+          this.swiptlist = res;
+        })
+        .catch(() => {});
+    },
+    change(item, index) {
+      this.transport_type_id = item.id;
+      this.index = index;
+      if (this.language == "zh-CN") {
+        this.type = item.name_cn;
+      }
+      if (this.language == "en-US") {
+        this.type = item.name_en;
+      }
+      if (this.language == "es-ES") {
+        this.type = item.name_es;
+      }
+      if (this.language == "it-IT") {
+        this.type = item.name_ita;
+      }
+    },
+    next() {
+      this.show = false;
+      this.show1 = true;
+      this.type1 = this.type;
+      this.container();
+    },
+    activea(item, idx) {
+      this.datechan = idx;
+      this.sum = item.sum;
+      this.unit_price = item.unit_price;
+      this.recommend_weight = item.recommend_weight;
+      this.containid = item.id;
+      this.weight_total = item.weight_total;
+      if (this.language == "zh-CN") {
+        this.containname = item.name_cn;
+      }
+      if (this.language == "en-US") {
+        this.containname = item.name_en;
+      }
+      if (this.language == "es-ES") {
+        this.containname = item.name_es;
+      }
+      if (this.language == "it-IT") {
+        this.containname = item.name_ita;
+      }
+    },
+    //确定
+    confirm() {
+      this.show1 = false;
+      this.containname1 = this.containname;
+      this.recommendweight();
+      this.config();
+    },
+    // 取消
+    close() {
+      this.show = false;
+      this.show1 = false;
+    },
+    //提交订单
+    topay() {
+      uni.$u.http
+        .post("/api/order", {
+          address_id: this.addinfo.id, //3	是	String	地址ID
+          goods_id: this.goodinfo.id, //65	是	String	商品id
+          goods_num: this.value, //2	是	String	商品数量
+          sku_item_id: this.sku_info.id, //60	是	String	规格id
+          cart_ids: this.stringcheck, //8,9	是	String	购物车id
+          remark: "", //备注	是	String	备注
+          merchant_goods_id: this.goodinfo.merchant_goods_id || "", //39	是	String	团长商品id
+          container_id: this.containid, //1	是	String	货柜id
+          share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
+          belong: this.goodinfo.source || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+        })
+        .then((res) => {
+          console.log("share_merchant_id", this.share_merchant_id);
+          console.log(res);
+          uni.navigateTo({
+            // url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
+            url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.toptitle {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		// font-size: 22rpx;
-		color: #222222;
-		line-height: 32rpx;
-		text-align: left;
-		font-style: normal;
-		// width: 148rpx;
-		width: 100%;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		-webkit-line-clamp: 1;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		word-break: break-all;
-	}
+.toptitle {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  // font-size: 22rpx;
+  color: #222222;
+  line-height: 32rpx;
+  text-align: left;
+  font-style: normal;
+  // width: 148rpx;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  word-break: break-all;
+}
 
-	::v-deep .u-status-bar {
-		height: 0 !important;
-	}
+::v-deep .u-status-bar {
+  height: 0 !important;
+}
 
-	.confirm {
-		width: 398rpx;
-		height: 84rpx;
-		background: #F83224;
-		border-radius: 42rpx;
-		text-align: center;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #FFFFFF;
-		line-height: 84rpx;
-		text-align: center;
-		font-style: normal;
-	}
+.confirm {
+  width: 398rpx;
+  height: 84rpx;
+  background: #f83224;
+  border-radius: 42rpx;
+  text-align: center;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #ffffff;
+  line-height: 84rpx;
+  text-align: center;
+  font-style: normal;
+}
 
-	.cancel {
-		width: 280rpx;
-		height: 84rpx;
-		border-radius: 42rpx;
-		border: 2rpx solid rgba(151, 151, 151, 0.3);
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #444444;
-		line-height: 84rpx;
-		text-align: center;
-		font-style: normal;
-	}
+.cancel {
+  width: 280rpx;
+  height: 84rpx;
+  border-radius: 42rpx;
+  border: 2rpx solid rgba(151, 151, 151, 0.3);
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 32rpx;
+  color: #444444;
+  line-height: 84rpx;
+  text-align: center;
+  font-style: normal;
+}
 
-	.enbottom {
-		width: 750rpx;
-		height: 166rpx;
-		background: #FFFFFF;
-		position: absolute;
-		left: 0rpx;
-		bottom: 0;
-		padding: 0 24rpx;
-		box-sizing: border-box;
-	}
+.enbottom {
+  width: 750rpx;
+  height: 166rpx;
+  background: #ffffff;
+  position: absolute;
+  left: 0rpx;
+  bottom: 0;
+  padding: 0 24rpx;
+  box-sizing: border-box;
+}
 
-	.mone {
-		font-family: JDZhengHT, JDZhengHT;
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #F83224;
-		line-height: 32rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.mone {
+  font-family: JDZhengHT, JDZhengHT;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #f83224;
+  line-height: 32rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.yundate {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 550;
-		font-size: 32rpx;
-		color: #333333;
-		line-height: 44rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.yundate {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 550;
+  font-size: 32rpx;
+  color: #333333;
+  line-height: 44rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.chest {
-		font-family: SFPro, SFPro;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #555555;
-		line-height: 28rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.chest {
+  font-family: SFPro, SFPro;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #555555;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.act {
-		width: 702rpx;
-		height: 164rpx;
-		background: #FFFFFF;
-		border-radius: 12rpx;
-		padding: 24rpx 20rpx;
-		box-sizing: border-box;
-		border: 1rpx solid #F83224;
-	}
+.act {
+  width: 702rpx;
+  height: 164rpx;
+  background: #ffffff;
+  border-radius: 12rpx;
+  padding: 24rpx 20rpx;
+  box-sizing: border-box;
+  border: 1rpx solid #f83224;
+}
 
-	.transport {
-		width: 702rpx;
-		height: 164rpx;
-		background: #FFFFFF;
-		border-radius: 12rpx;
-		padding: 24rpx 20rpx;
-		box-sizing: border-box;
-	}
+.transport {
+  width: 702rpx;
+  height: 164rpx;
+  background: #ffffff;
+  border-radius: 12rpx;
+  padding: 24rpx 20rpx;
+  box-sizing: border-box;
+}
 
-	.nextto {
-		width: 702rpx;
-		height: 84rpx;
-		background: #F83224;
-		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;
-		margin-top: 108rpx;
-	}
+.nextto {
+  width: 702rpx;
+  height: 84rpx;
+  background: #f83224;
+  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;
+  margin-top: 108rpx;
+}
 
-	.logname {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 40rpx;
-		text-align: right;
-		font-style: normal;
-		overflow: hidden;
-		width: 220rpx;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		text-align: center;
-		word-break: break-all;
-	}
+.logname {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #333333;
+  line-height: 40rpx;
+  text-align: right;
+  font-style: normal;
+  overflow: hidden;
+  width: 220rpx;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  text-align: center;
+  word-break: break-all;
+}
 
-	.wei {
-		font-family: JDZhengHT, JDZhengHT;
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #F83224;
-		line-height: 40rpx;
-		text-align: right;
-		font-style: normal;
-		margin-top: 8rpx;
-	}
+.wei {
+  font-family: JDZhengHT, JDZhengHT;
+  font-weight: 400;
+  font-size: 32rpx;
+  color: #f83224;
+  line-height: 40rpx;
+  text-align: right;
+  font-style: normal;
+  margin-top: 8rpx;
+}
 
-	.active {
-		width: 218rpx;
-		height: 148rpx;
-		background: rgba(247, 50, 36, 0.05);
-		border-radius: 8rpx;
-		border: 1rpx solid #F83224;
-	}
+.active {
+  width: 218rpx;
+  height: 148rpx;
+  background: rgba(247, 50, 36, 0.05);
+  border-radius: 8rpx;
+  border: 1rpx solid #f83224;
+}
 
-	.unactive {
-		width: 218rpx;
-		height: 148rpx;
-		border-radius: 12rpx;
-		border: 1rpx solid #C3C3C3;
-	}
+.unactive {
+  width: 218rpx;
+  height: 148rpx;
+  border-radius: 12rpx;
+  border: 1rpx solid #c3c3c3;
+}
 
-	.poptitle {
-		width: 142rpx;
-		height: 50rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 600;
-		font-size: 36rpx;
-		color: #333333;
-		text-align: center;
-		width: 100%;
-	}
+.poptitle {
+  width: 142rpx;
+  height: 50rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 600;
+  font-size: 36rpx;
+  color: #333333;
+  text-align: center;
+  width: 100%;
+}
 
-	.back {
-		background: rgba(244, 244, 244, 1);
-		padding: 20rpx 24rpx;
-		box-sizing: border-box;
+.back {
+  background: rgba(244, 244, 244, 1);
+  padding: 20rpx 24rpx;
+  box-sizing: border-box;
 
-		.btn {
-			width: 750rpx;
-			height: 166rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx -1rpx 0rpx 0rpx rgba(0, 0, 0, 0.05);
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			padding: 0 24rpx 5rpx 5rpx;
-			box-sizing: border-box;
+  .btn {
+    width: 750rpx;
+    height: 166rpx;
+    background: #ffffff;
+    box-shadow: 0rpx -1rpx 0rpx 0rpx rgba(0, 0, 0, 0.05);
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    padding: 0 24rpx 5rpx 5rpx;
+    box-sizing: border-box;
 
-			.money {
-				font-family: HarmonyOS_Sans_Medium;
-				font-size: 48rpx;
-				color: #F83224;
-				line-height: 38rpx;
-				text-align: left;
-				font-style: normal;
-				// font-weight: 500;
-				font-weight: bold;
-			}
+    .money {
+      font-family: HarmonyOS_Sans_Medium;
+      font-size: 48rpx;
+      color: #f83224;
+      line-height: 38rpx;
+      text-align: left;
+      font-style: normal;
+      // font-weight: 500;
+      font-weight: bold;
+    }
 
-			.kg {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #333333;
-				line-height: 34rpx;
-				text-align: left;
-				font-style: normal;
-			}
+    .kg {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #333333;
+      line-height: 34rpx;
+      text-align: left;
+      font-style: normal;
+    }
 
-			.order {
-				width: 232rpx;
-				height: 80rpx;
-				background: #F83224;
-				border-radius: 40rpx;
-				font-family: PingFangTC, PingFangTC;
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #FFFFFF;
-				line-height: 80rpx;
-				text-align: center;
-				font-style: normal;
-				margin-left: 20rpx;
-			}
-		}
+    .order {
+      width: 232rpx;
+      height: 80rpx;
+      background: #f83224;
+      border-radius: 40rpx;
+      font-family: PingFangTC, PingFangTC;
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #ffffff;
+      line-height: 80rpx;
+      text-align: center;
+      font-style: normal;
+      margin-left: 20rpx;
+    }
+  }
 
-		//商品相关
-		.abount {
-			padding: 28rpx 24rpx;
-			box-sizing: border-box;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			width: 702rpx;
+  //商品相关
+  .abount {
+    padding: 28rpx 24rpx;
+    box-sizing: border-box;
+    background: #ffffff;
+    border-radius: 16rpx;
+    width: 702rpx;
 
-			.zong {
-				width: 654rpx;
-				padding: 22rpx 0 0 0;
-				border-top: 2rpx solid rgba(151, 151, 151, 0.1);
-				margin-top: 32rpx;
+    .zong {
+      width: 654rpx;
+      padding: 22rpx 0 0 0;
+      border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+      margin-top: 32rpx;
 
-				.small {
-					font-family: PingFangTC, PingFangTC;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #444444;
-					line-height: 34rpx;
-					text-align: left;
-					font-style: normal;
-				}
+      .small {
+        font-family: PingFangTC, PingFangTC;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #444444;
+        line-height: 34rpx;
+        text-align: left;
+        font-style: normal;
+      }
 
-				.mon {
-					font-family: HarmonyOS_Sans_Medium;
-					font-size: 28rpx;
-					color: #F83224;
-					line-height: 38rpx;
-					text-align: left;
-					font-style: normal;
-					margin-left: 12rpx;
-					font-weight: bold;
-				}
-			}
+      .mon {
+        font-family: HarmonyOS_Sans_Medium;
+        font-size: 28rpx;
+        color: #f83224;
+        line-height: 38rpx;
+        text-align: left;
+        font-style: normal;
+        margin-left: 12rpx;
+        font-weight: bold;
+      }
+    }
 
-			.back {
-				background: rgba(244, 244, 244, 1);
-				padding: 22rpx 16rpx;
-				box-sizing: border-box;
-				margin-top: 10rpx;
-				// margin-bottom: 20rpx;
-			}
+    .back {
+      background: rgba(244, 244, 244, 1);
+      padding: 22rpx 16rpx;
+      box-sizing: border-box;
+      margin-top: 10rpx;
+      // margin-bottom: 20rpx;
+    }
 
-			.name {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-				line-height: 40rpx;
-				text-align: left;
-				font-style: normal;
-			}
+    .name {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: left;
+      font-style: normal;
+    }
 
-			.money {
-				font-family: HarmonyOS_Sans_Medium;
-				font-size: 28rpx;
-				color: #222222;
-				line-height: 38rpx;
-				text-align: left;
-				font-style: normal;
-				font-weight: 600;
-			}
-		}
+    .money {
+      font-family: HarmonyOS_Sans_Medium;
+      font-size: 28rpx;
+      color: #222222;
+      line-height: 38rpx;
+      text-align: left;
+      font-style: normal;
+      font-weight: 600;
+    }
+  }
 
-		.recommend {
-			margin-top: 20rpx;
+  .recommend {
+    margin-top: 20rpx;
 
-			.title {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 22rpx;
-				color: #222222;
-				line-height: 32rpx;
-				text-align: left;
-				font-style: normal;
-				width: 148rpx;
-				height: 64rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				-webkit-line-clamp: 2;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				word-break: break-all;
-			}
+    .title {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 22rpx;
+      color: #222222;
+      line-height: 32rpx;
+      text-align: left;
+      font-style: normal;
+      width: 148rpx;
+      height: 64rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      -webkit-line-clamp: 2;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      word-break: break-all;
+    }
 
-			.top {
-				width: 702rpx;
-				height: 64rpx;
-				background: linear-gradient(180deg, #FFE7E3 0%, rgba(255, 255, 255, 1) 100%);
-				border-radius: 16rpx 16rpx 0 0;
-				padding: 24rpx 22rpx;
-				box-sizing: border-box;
-			}
+    .top {
+      width: 702rpx;
+      height: 64rpx;
+      background: linear-gradient(
+        180deg,
+        #ffe7e3 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      border-radius: 16rpx 16rpx 0 0;
+      padding: 24rpx 22rpx;
+      box-sizing: border-box;
+    }
 
-			.bottom {
-				padding: 0 20rpx 22rpx;
-				box-sizing: border-box;
-				background: #fff;
-			}
-		}
+    .bottom {
+      padding: 0 20rpx 22rpx;
+      box-sizing: border-box;
+      background: #fff;
+    }
+  }
 
-		//物流
-		.logistics {
-			width: 702rpx;
-			// height: 96rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			padding: 28rpx 22rpx;
-			box-sizing: border-box;
-			margin-top: 20rpx;
+  //物流
+  .logistics {
+    width: 702rpx;
+    // height: 96rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 28rpx 22rpx;
+    box-sizing: border-box;
+    margin-top: 20rpx;
 
-			.change {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #F83224;
-				line-height: 40rpx;
-				text-align: left;
-				font-style: normal;
-				margin-right: 8rpx;
-			}
-		}
+    .change {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #f83224;
+      line-height: 40rpx;
+      text-align: left;
+      font-style: normal;
+      margin-right: 8rpx;
+    }
+  }
 
-		//商城
-		.shop {
-			width: 702rpx;
-			// height: 322rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			padding: 30rpx 24rpx;
-			margin-top: 20rpx;
-			box-sizing: border-box;
+  //商城
+  .shop {
+    width: 702rpx;
+    // height: 322rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 30rpx 24rpx;
+    margin-top: 20rpx;
+    box-sizing: border-box;
 
-			.bu {
-				width: 120rpx;
-				height: 40rpx;
-				border-radius: 20rpx;
-				border: 1rpx solid rgba(151, 151, 151, 0.3);
-			}
+    .bu {
+      width: 120rpx;
+      height: 40rpx;
+      border-radius: 20rpx;
+      border: 1rpx solid rgba(151, 151, 151, 0.3);
+    }
 
-			.money {
-				font-family: HarmonyOS_Sans_Medium;
-				font-size: 24rpx;
-				color: #F83224;
-				line-height: 34rpx;
-				text-align: left;
-				font-style: normal;
-				font-weight: 600;
-			}
+    .money {
+      font-family: HarmonyOS_Sans_Medium;
+      font-size: 24rpx;
+      color: #f83224;
+      line-height: 34rpx;
+      text-align: left;
+      font-style: normal;
+      font-weight: 600;
+    }
 
-			.name {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 30rpx;
-				color: #222222;
-				line-height: 42rpx;
-				text-align: left;
-				font-style: normal;
-				margin-left: 10rpx;
-			}
+    .name {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 30rpx;
+      color: #222222;
+      line-height: 42rpx;
+      text-align: left;
+      font-style: normal;
+      margin-left: 10rpx;
+    }
 
-			.weight {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: rgba(34, 34, 34, 0.6);
-				line-height: 34rpx;
-				text-align: left;
-				font-style: normal;
-				margin-top: 16rpx;
-			}
-		}
+    .weight {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: rgba(34, 34, 34, 0.6);
+      line-height: 34rpx;
+      text-align: left;
+      font-style: normal;
+      margin-top: 16rpx;
+    }
+  }
 
-		// 地址
-		.address {
-			width: 702rpx;
-			// height: 182rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			padding: 32rpx 24rpx;
-			box-sizing: border-box;
+  // 地址
+  .address {
+    width: 702rpx;
+    // height: 182rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 32rpx 24rpx;
+    box-sizing: border-box;
 
-			.add {
-				font-family: SFPro, SFPro;
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #222222;
-				line-height: 36rpx;
-				text-align: left;
-				font-style: normal;
-			}
+    .add {
+      font-family: SFPro, SFPro;
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #222222;
+      line-height: 36rpx;
+      text-align: left;
+      font-style: normal;
+    }
 
-			.info {
-				font-family: SFPro, SFPro;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #555555;
-				line-height: 28rpx;
-				text-align: left;
-				font-style: normal;
-				margin-top: 20rpx;
-			}
-		}
-	}
+    .info {
+      font-family: SFPro, SFPro;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #555555;
+      line-height: 28rpx;
+      text-align: left;
+      font-style: normal;
+      margin-top: 20rpx;
+    }
+  }
+}
 
-	.minus {
-		width: 22px;
-		height: 22px;
-		border-width: 1px;
-		border-color: #E6E6E6;
-		border-style: solid;
-		border-top-left-radius: 100px;
-		border-top-right-radius: 100px;
-		border-bottom-left-radius: 100px;
-		border-bottom-right-radius: 100px;
-		@include flex;
-		justify-content: center;
-		align-items: center;
-	}
+.minus {
+  width: 22px;
+  height: 22px;
+  border-width: 1px;
+  border-color: #e6e6e6;
+  border-style: solid;
+  border-top-left-radius: 100px;
+  border-top-right-radius: 100px;
+  border-bottom-left-radius: 100px;
+  border-bottom-right-radius: 100px;
+  @include flex;
+  justify-content: center;
+  align-items: center;
+}
 
-	.input {
-		padding: 0 10px;
-	}
+.input {
+  padding: 0 10px;
+}
 
-	.plus {
-		width: 22px;
-		height: 22px;
-		background-color: #FF0000;
-		border-radius: 50%;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-	}
-</style>
+.plus {
+  width: 22px;
+  height: 22px;
+  background-color: #ff0000;
+  border-radius: 50%;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  justify-content: center;
+  align-items: center;
+}
+</style>

+ 21 - 3
pageC/applicationRefund/applicationRefund.vue

@@ -99,9 +99,7 @@
     <reasonPopupVue :show="show" @close="close"></reasonPopupVue>
 
     <view class="footer">
-      <button class="btn" @click="submitApplication" v-if="btnShow">
-        提交申请
-      </button>
+      <button class="btn" @click="submitApplication">提交申请</button>
     </view>
   </view>
 </template>
@@ -142,6 +140,7 @@ export default {
     // 删除图片
     deletePic(event) {
       this[`fileList${event.name}`].splice(event.index, 1);
+      this.imgList.splice(event.index, 1);
     },
     // 新增图片
     async afterRead(event) {
@@ -205,6 +204,13 @@ export default {
 
     //提交申请
     submitApplication() {
+      if (!this.btnShow) {
+        uni.showToast({
+          title: "请等待图片上传完毕",
+          icon: "none",
+        });
+        return;
+      }
       uni.$u.http
         .post(`/api/order/refund`, {
           order_id: this.goodsDetail.id,
@@ -235,6 +241,7 @@ export default {
 .page {
   padding: 20rpx 24rpx;
   position: relative;
+  padding-bottom: 166rpx;
   .commodity-information {
     padding: 28rpx 20rpx;
     background-color: #fff;
@@ -375,4 +382,15 @@ export default {
   background-color: #f4f4f4;
   padding: 0;
 }
+
+::v-deep .u-upload__deletable {
+  width: 22px !important;
+  height: 22px !important;
+}
+::v-deep .u-upload__deletable__icon {
+  top: 3px !important;
+}
+::v-deep .u-icon__icon {
+  font-size: 18px !important;
+}
 </style>

+ 20 - 16
pageC/orderForm/component/orderInofrmation.vue

@@ -16,8 +16,8 @@
       </view>
       <text
         class="order-status"
-        :style="itemInfo.order.status == 'closed' ? 'color:#666' : ''"
-        >{{ itemInfo.order.status_text }}</text
+        :style="itemInfo.order.simplify_status == 'closed' ? 'color:#666' : ''"
+        >{{ itemInfo.order.simplify_status_text }}</text
       >
     </view>
     <view
@@ -68,7 +68,7 @@
     <view class="btn-list">
       <view
         class="more"
-        v-if="itemInfo.order.status == 'finished'"
+        v-if="itemInfo.order.simplify_status == 'finished'"
         @click.stop="more"
       >
         更多
@@ -76,13 +76,13 @@
       <button
         class="status-1"
         @click.stop="$emit('cancellationOrder', itemInfo)"
-        v-if="itemInfo.order.status == 'unpaid'"
+        v-if="itemInfo.order.simplify_status == 'unpaid'"
       >
         取消订单
       </button>
       <button
         class="status-2"
-        v-if="itemInfo.order.status == 'unpaid'"
+        v-if="itemInfo.order.simplify_status == 'unpaid'"
         @click.stop="$emit('toPay', itemInfo)"
       >
         继续付款
@@ -90,20 +90,24 @@
       <button
         class="status-1"
         v-if="
-          itemInfo.order.status == 'closed' || itemInfo.order.status == 'refund'
+          itemInfo.order.simplify_status == 'closed' ||
+          itemInfo.order.simplify_status == 'refund'
         "
       >
         删除订单
       </button>
-      <button class="status-2" v-if="itemInfo.order.status == 'closed'">
+      <button
+        class="status-2"
+        v-if="itemInfo.order.simplify_status == 'closed'"
+      >
         再次购买
       </button>
       <button
         class="status-1"
         @click.stop="$emit('toLogistics', itemInfo)"
         v-if="
-          itemInfo.order.status == 'delivered' ||
-          itemInfo.order.status == 'finished'
+          itemInfo.order.simplify_status == 'delivered' ||
+          itemInfo.order.simplify_status == 'finished'
         "
       >
         查看物流
@@ -111,8 +115,8 @@
       <button
         class="status-1"
         v-if="
-          itemInfo.order.status == 'refund' ||
-          itemInfo.order.status == 'finished'
+          itemInfo.order.simplify_status == 'refund' ||
+          itemInfo.order.simplify_status == 'finished'
         "
         @click.stop="$emit('againOrder', itemInfo)"
       >
@@ -120,7 +124,7 @@
       </button>
       <button
         class="status-2"
-        v-if="itemInfo.order.status == 'delivered'"
+        v-if="itemInfo.order.simplify_status == 'delivered'"
         @click.stop="$emit('confirm', itemInfo)"
       >
         确认收货
@@ -128,13 +132,15 @@
 
       <button
         class="status-2"
-        v-if="itemInfo.order.status == 'finished'"
+        v-if="itemInfo.order.simplify_status == 'finished'"
         @click.stop="$emit('toEvaluate', itemInfo)"
       >
         评价
       </button>
       <u-transition :show="show">
-        <view class="transition" @click.stop="deleteOrder">删除订单</view>
+        <view class="transition" @click.stop="$emit('deleteOrder', itemInfo)"
+          >删除订单</view
+        >
       </u-transition>
     </view>
   </view>
@@ -164,14 +170,12 @@ export default {
   methods: {
     more() {
       this.show = !this.show;
-      console.log(this.show);
     },
     // toEvaluate() {
     //   uni.navigateTo({
     //     url: "/pageD/evaluate/evaluate?",
     //   });
     // },
-    deleteOrder() {},
   },
 };
 </script>

+ 17 - 2
pageC/orderForm/orderForm.vue

@@ -90,6 +90,7 @@
       <view v-for="(item, index) in orderList" :key="index">
         <view v-if="follow != 'refund'">
           <OrderInofrmation
+            ref="orderInformation"
             :itemInfo="item"
             @toDetail="toDetail"
             @cancellationOrder="cancellationOrder"
@@ -99,6 +100,7 @@
             @unreviewAfter="unreviewAfter"
             @toLogistics="toLogistics"
             @againOrder="againOrder"
+            @deleteOrder="deleteOrder"
           />
         </view>
         <view v-else>
@@ -206,14 +208,27 @@ export default {
 
     //再来一单
     againOrder(item) {
-      console.log(item);
-
       uni.navigateTo({
         url: `/pageD/newBulitOrder/newBulitOrder?goodsList=${encodeURIComponent(
           JSON.stringify(item)
         )}`,
       });
     },
+
+    //删除订单
+    deleteOrder(item) {
+      uni.$u.http
+        .post(`/api/order/order_del`, { order_id: item.order.id })
+        .then((res) => {
+          this.getOrderList(1);
+          this.$refs.orderInformation.more();
+          uni.showToast({
+            title: "删除成功",
+            icon: "none",
+          });
+        });
+    },
+
     //关闭确认弹窗
     close(value) {
       this.agreeShow = false;

+ 2 - 2
pageC/orderFormDetail/component/commodityDetail.vue

@@ -95,8 +95,8 @@
     <view class="information">
       <text class="_label">跨境物流</text>
       <view lass="_title-right">
-        {{ orderDetail.container.transport_type.name }} |
-        {{ orderDetail.container.base.name }}
+        {{ orderDetail.container.transport_type.name_cn }} |
+        {{ orderDetail.container.name_cn }}
       </view>
     </view>
     <view class="information last">

+ 59 - 22
pageC/orderFormDetail/orderFormDetail.vue

@@ -2,10 +2,11 @@
   <view class="page" @click="closeShow">
     <!-- 订单状态 -->
     <view class="title">
-      <view class="payment">{{ orderDetail.status_name }}</view>
+      <view class="payment">{{ orderDetail.simplify_status_text }}</view>
 
       <text class="timer" v-if="orderDetail.simplify_status == 'unpaid'"
-        >剩{{ hours }}小时{{ minute }}分自动关闭</text
+        >剩<text v-if="loseEfficacy / 60 > 1">{{ hours }}小时</text
+        >{{ minute }}分自动关闭</text
       >
       <text
         v-else-if="orderDetail.simplify_status == 'undifference'"
@@ -70,8 +71,8 @@
         class="order-number"
         v-if="
           orderDetail.simplify_status == 'unreview' ||
-          orderDetail.status == 'paid' ||
-          orderDetail.status == 'merdelivered' ||
+          orderDetail.simplify_status == 'paid' ||
+          orderDetail.simplify_status == 'merdelivered' ||
           orderDetail.simplify_status == 'finished' ||
           orderDetail.simplify_status == 'delivered' ||
           orderDetail.simplify_status == 'undelivered' ||
@@ -85,7 +86,7 @@
         class="order-number"
         v-if="
           orderDetail.simplify_status == 'unreview' ||
-          orderDetail.status == 'paid' ||
+          orderDetail.simplify_status == 'paid' ||
           orderDetail.simplify_status == 'finished' ||
           orderDetail.simplify_status == 'undelivered' ||
           orderDetail.simplify_status == 'delivered' ||
@@ -103,11 +104,11 @@
     <view
       class="contact"
       v-if="
-        (orderDetail.status == 'unpaid' ||
-          orderDetail.status == 'paid' ||
-          orderDetail.status != 'merdelivered' ||
+        (orderDetail.simplify_status == 'unpaid' ||
+          orderDetail.simplify_status == 'paid' ||
+          orderDetail.simplify_status != 'merdelivered' ||
           orderDetail.simplify_status == 'undelivered') &&
-        orderDetail.status != 'closed'
+        orderDetail.simplify_status != 'closed'
       "
     >
       联系团长
@@ -115,16 +116,16 @@
     <view
       class="footer"
       v-if="
-        orderDetail.status != 'paid' &&
-        orderDetail.status != 'merdelivered' &&
-        orderDetail.status != 'unreview' &&
-        orderDetail.status != 'undelivered'
+        orderDetail.simplify_status != 'paid' &&
+        orderDetail.simplify_status != 'merdelivered' &&
+        orderDetail.simplify_status != 'unreview' &&
+        orderDetail.simplify_status != 'undelivered'
       "
     >
       <button
         class="status-1"
         v-if="
-          orderDetail.status == 'unpaid' ||
+          orderDetail.simplify_status == 'unpaid' ||
           orderDetail.simplify_status == 'unreview'
         "
         @click="cancelOrder"
@@ -133,33 +134,43 @@
       </button>
       <button
         class="status-2"
-        v-if="orderDetail.status == 'unpaid'"
+        v-if="orderDetail.simplify_status == 'unpaid'"
         @click="toUnPay"
       >
         继续付款
       </button>
       <button
         class="status-1"
-        v-if="orderDetail.status == 'closed' || status == 3 || status == 4"
+        v-if="
+          orderDetail.simplify_status == 'closed' || status == 3 || status == 4
+        "
       >
         删除订单
       </button>
       <button
         class="status-2"
-        v-if="orderDetail.status == 'closed' || status == 3 || status == 4"
+        v-if="
+          orderDetail.simplify_status == 'closed' || status == 3 || status == 4
+        "
       >
         再次购买
       </button>
       <button
         class="status-1"
-        v-if="orderDetail.simplify_status == 'delivered'"
+        v-if="
+          orderDetail.simplify_status == 'domestic_delivered' ||
+          orderDetail.simplify_status == 'delivered'
+        "
         @click="toLogistics"
       >
         查看物流
       </button>
       <button
         class="status-2"
-        v-if="orderDetail.simplify_status == 'delivered'"
+        v-if="
+          orderDetail.simplify_status == 'domestic_delivered' ||
+          orderDetail.simplify_status == 'delivered'
+        "
         @click="confirmReceipt"
       >
         确认收货
@@ -197,7 +208,7 @@
     </view>
 
     <u-transition :show="show">
-      <view class="transition">删除订单</view>
+      <view class="transition" @click.stop="deleteOrder">删除订单</view>
     </u-transition>
     <agreePopup title="是否确认收货" :agreeShow="agreeShow" @close="close" />
   </view>
@@ -219,6 +230,7 @@ export default {
       agreeShow: false,
       hours: "",
       minute: "",
+      loseEfficacy: "", //失效时间
     };
   },
   methods: {
@@ -266,6 +278,20 @@ export default {
       });
     },
 
+    //删除订单
+    deleteOrder() {
+      uni.$u.http
+        .post(`/api/order/order_del`, { order_id: this.orderDetail.id })
+        .then((res) => {
+          this.getDetail();
+          this.show = false;
+          uni.showToast({
+            title: "删除成功",
+            icon: "none",
+          });
+        });
+    },
+
     //查看物流进度
     toLogistics(value) {
       uni.navigateTo({
@@ -315,10 +341,11 @@ export default {
       const nowTime = new Date().getTime(); //当前时间的毫秒数
       const appointTime = new Date(timer).getTime(); //创建订单时间的毫秒数
       const count = nowTime - appointTime; //当前时间到创建订单时间的毫秒数
+      const loseEfficacyTime = this.loseEfficacy * 60 * 1000; //失效时间转换为毫秒
 
       //86400000  24小时
-      if (count < 86400000) {
-        const currentTime = 86400000 - count;
+      if (count < loseEfficacyTime) {
+        const currentTime = loseEfficacyTime - count;
         this.hours = Math.floor(currentTime / (1000 * 60 * 60)); //获取小时
         //获取分钟
         this.minute = Math.floor(
@@ -334,8 +361,18 @@ export default {
         this.getCountdown(this.orderDetail.created_at);
       });
     },
+
+    //获取配置信息
+    getConfig() {
+      uni.$u.http
+        .get(`/api/config?module=basic&key=order_pay_termine`)
+        .then((res) => {
+          this.loseEfficacy = res;
+        });
+    },
   },
   onShow() {
+    this.getConfig();
     this.getDetail();
   },
   created() {},

+ 1 - 1
pageC/refundDetail/component/refundInProgress.vue

@@ -13,7 +13,7 @@
         }}</text>
       </view>
     </view>
-    <view class="time"> 剩余2天12时34分,若超时处理,退款申请将自动通过 </view>
+    <!-- <view class="time"> 剩余2天12时34分,若超时处理,退款申请将自动通过 </view> -->
   </view>
 </template>
 

+ 2 - 2
pageC/refundDetail/component/refundInformation.vue

@@ -16,7 +16,7 @@
       </view>
       <view class="title-right">
         <u-icon name="chat" color="#f83224" size="28"></u-icon>
-        <text>联系团长</text>
+        <text>联系{{ goodsDetail.merchant.id == 1 ? "平台" : "团长" }}</text>
       </view>
     </view>
     <view class="commodity-information">
@@ -64,7 +64,7 @@
     </view>
     <view class="information">
       <text class="_label">申请时间</text>
-      <view class="_title-right">{{ goodsDetail.created_at }}</view>
+      <view class="_title-right">{{ goodsDetail.refund.created_at }}</view>
     </view>
   </view>
 </template>

+ 2 - 2
pageC/refundDetail/component/refusalToRefund.vue

@@ -4,8 +4,8 @@
       <view class="direction-frist">
         <view class=""> 卖家拒绝了您的退款申请 </view>
       </view>
-      <view class="time">
-        {{ refundDetail.goods[0].refund.reason || "" }}
+      <view class="time" v-if="refundDetail.goods[0].refund.reason">
+        商家: {{ refundDetail.goods[0].refund.reason }}
       </view>
       <view class="time"> {{ refundDetail.goods[0].refund.updated_at }} </view>
     </view>

+ 1 - 1
pageD/afterSalesDetail/afterSalesDetail.vue

@@ -91,7 +91,6 @@ export default {
     },
     //关闭弹窗,确认是否退款,status有值则退款
     close(status, value) {
-      console.log(value);
       this.show = false;
       this.agreeShow = false;
       if (status) {
@@ -100,6 +99,7 @@ export default {
             status,
             order_refund_id: this.orderInformation.goods[0].refund.id,
             reason: value,
+            actual_refund_price: value,
           })
           .then((res) => {
             uni.showToast({

+ 4 - 1
pageD/afterSalesDetail/component/applicationInformation.vue

@@ -79,13 +79,16 @@ export default {
     justify-content: space-between;
     .photo-list {
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
+      flex-wrap: wrap;
+      width: 80%;
       .img-1 {
         width: 156rpx;
         height: 156rpx;
         border-radius: 10rpx;
         // background-color: #d4d4d4;
         margin-left: 16rpx;
+        margin-bottom: 10rpx;
       }
     }
   }

+ 1 - 0
pageD/afterSalesManage/afterSalesManage.vue

@@ -125,6 +125,7 @@ export default {
             status,
             order_refund_id: this.needRdfundOrder.id,
             reason: value,
+            actual_refund_price: value,
           })
           .then((res) => {
             this.show = false;

+ 10 - 2
pageD/afterSalesManage/component/agreePop.vue

@@ -3,9 +3,17 @@
     <u-popup :show="show" @close="$emit('close')" mode="center" round="10">
       <view class="content">
         <text>{{ title }}</text>
+
+        <u--input
+          v-if="title == '是否确认退款'"
+          placeholder="请输入退款金额"
+          border="surround"
+          type="number"
+          v-model="value"
+        ></u--input>
         <view class="btn-list">
           <button class="btn-1" @click="$emit('close')">取消</button>
-          <button class="btn-2" @click="$emit('refund', 1)">确认</button>
+          <button class="btn-2" @click="$emit('refund', 1, value)">确认</button>
         </view>
       </view>
     </u-popup>
@@ -24,7 +32,7 @@ export default {
     },
   },
   data() {
-    return {};
+    return { value: "" };
   },
 };
 </script>

+ 29 - 2
pageD/components/agreePopup.vue

@@ -9,9 +9,17 @@
     >
       <view class="popup-content">
         <view class="title"> {{ title }} </view>
+
+        <u--input
+          v-if="title == '请确认是否退款'"
+          placeholder="请输入退款金额"
+          border="surround"
+          type="number"
+          v-model="value"
+        ></u--input>
         <view class="btn-list">
           <button class="btn-2" @click="$emit('close')">取消</button>
-          <button class="btn-1" @click="$emit('close', 1)">提交</button>
+          <button class="btn-1" @click="submit">提交</button>
         </view>
       </view>
     </u-popup>
@@ -36,7 +44,25 @@ export default {
     },
   },
   data() {
-    return {};
+    return {
+      value: "",
+    };
+  },
+  methods: {
+    submit() {
+      if (this.title == "请确认是否退款") {
+        if (!this.value) {
+          uni.showToast({
+            title: "请输入退款金额",
+            icon: "none",
+          });
+          return;
+        }
+        this.$emit("close", 1, this.value);
+      } else {
+        this.$emit("close", 1);
+      }
+    },
   },
 };
 </script>
@@ -55,6 +81,7 @@ export default {
   .btn-list {
     display: flex;
     justify-content: space-around;
+    margin-top: 20rpx;
     .btn-1 {
       background-color: #f83224;
       color: #fff;

+ 2 - 2
pageD/components/goodsInformation.vue

@@ -80,7 +80,7 @@
     <view class="btn-list" v-if="!batch && productAndCommodity == 'product'">
       <button
         class="btn-1"
-        @click.stop="$emit('goodsUpDown', 0, itemInfo)"
+        @click.stop="$emit('goodsUpDown', 'down', itemInfo)"
         v-if="itemInfo.review_status == 1 && itemInfo.status == 'normal'"
       >
         下架商品
@@ -90,7 +90,7 @@
       <!-- <button class="btn-1" v-if="itemInfo.status == 'down'">编辑</button> -->
       <button
         class="btn-1"
-        @click.stop="$emit('goodsUpDown', 1, itemInfo)"
+        @click.stop="$emit('goodsUpDown', 'normal', itemInfo)"
         v-if="
           itemInfo.review_status != '0' &&
           itemInfo.review_status != '2' &&

+ 330 - 286
pageD/homepage/homepage.vue

@@ -1,318 +1,362 @@
 <template>
-	<view class="page">
-		<!-- 页面渐变色背景 -->
-		<view class="shadow"> </view>
-		<!-- 页面渐变色背景 -->
-		<view class="content">
-			<view class="top-information">
-				<image class="user-header" :src="userInfo.image" mode=""> </image>
-				<view class="btn-list">
-					<button class="btn-1" @click="tochat" v-if="show">
-						<u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
-					</button>
-					<button v-if="isShow != '1' && userInfo.is_interest == 1" class="btn-1" @click="followTeam(0)">
-						<u-icon color="#f83224" size="14" name="plus"></u-icon>关注
-					</button>
-					<button class="btn-1" v-if="userInfo.is_interest == 0" @click="followTeam(1)">
-						已关注
-					</button>
-				</view>
-				<view class="name"> {{ userInfo.merchant_name }} </view>
+  <view class="page">
+    <!-- 页面渐变色背景 -->
+    <view class="shadow"> </view>
+    <!-- 页面渐变色背景 -->
+    <view class="content">
+      <view class="top-information">
+        <image class="user-header" :src="userInfo.image" mode=""> </image>
+        <view class="btn-list">
+          <!--v-if="show"  -->
+          <button class="btn-1" @click="tochat">
+            <u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
+          </button>
+          <button
+            v-if="isShow != '1' && userInfo.is_interest == 1"
+            class="btn-1"
+            @click="followTeam(0)"
+          >
+            <u-icon color="#f83224" size="14" name="plus"></u-icon>关注
+          </button>
+          <button
+            class="btn-1"
+            v-if="userInfo.is_interest == 0"
+            @click="followTeam(1)"
+          >
+            已关注
+          </button>
+        </view>
+        <view class="name"> {{ userInfo.merchant_name }} </view>
 
-				<view class="score">
-					<u-rate count="5" disabled :allowHalf="true" :gutter="1" inactiveColor="#ffacab"
-						activeColor="#FF1515" v-model="userInfo.score" :size="12"></u-rate>
-					<text class="num">{{ userInfo.score }}</text>
-				</view>
-				<view class="sale">
-					<view class="">
-						销售量
-						<text space="nbsp">{{ "&nbsp;" }} {{ userInfo.sales_num }}</text>
-					</view>
-					<text space="nbsp" class="shu">{{ "&nbsp;&nbsp;" }} | {{ "&nbsp;&nbsp;" }}</text>
-					<view class="">
-						评价总数
-						<text space="nbsp">{{ "&nbsp;" }} {{ userInfo.comment_num }}</text>
-					</view>
-				</view>
-			</view>
+        <view class="score">
+          <u-rate
+            count="5"
+            disabled
+            :allowHalf="true"
+            :gutter="1"
+            inactiveColor="#ffacab"
+            activeColor="#FF1515"
+            v-model="userInfo.score"
+            :size="12"
+          ></u-rate>
+          <text class="num">{{ userInfo.score }}</text>
+        </view>
+        <view class="sale">
+          <view class="">
+            销售量
+            <text space="nbsp">{{ "&nbsp;" }} {{ userInfo.sales_num }}</text>
+          </view>
+          <text space="nbsp" class="shu"
+            >{{ "&nbsp;&nbsp;" }} | {{ "&nbsp;&nbsp;" }}</text
+          >
+          <view class="">
+            评价总数
+            <text space="nbsp">{{ "&nbsp;" }} {{ userInfo.comment_num }}</text>
+          </view>
+        </view>
+      </view>
 
-			<view class="goods-list">
-				<view class="tab-list">
-					<view :class="{ tab: selectTab == 1 }" @click="switchTab(1)">
-						默认
-					</view>
-					<view :class="{ tab: selectTab == 2 }" @click="switchTab(2)">新品</view>
-					<view :class="{ tab: selectTab == 3 }" @click="switchTab(3)">销量</view>
-					<view class="price" :class="{ tab: selectTab == 4 }" @click="switchTab(4)">价格
-						<view style="
+      <view class="goods-list">
+        <view class="tab-list">
+          <view :class="{ tab: selectTab == 1 }" @click="switchTab(1)">
+            默认
+          </view>
+          <view :class="{ tab: selectTab == 2 }" @click="switchTab(2)"
+            >新品</view
+          >
+          <view :class="{ tab: selectTab == 3 }" @click="switchTab(3)"
+            >销量</view
+          >
+          <view
+            class="price"
+            :class="{ tab: selectTab == 4 }"
+            @click="switchTab(4)"
+            >价格
+            <view
+              style="
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
                 margin-left: 6rpx;
                 margin-top: 4rpx;
-              ">
-							<u-icon name="arrow-up-fill" size="6"
-								:color="iconUp == 1 ? '#f83224' : '#303133'"></u-icon><u-icon
-								:color="iconUp == 2 ? '#f83224' : '#303133'" size="6" name="arrow-down-fill"></u-icon>
-						</view>
-					</view>
-				</view>
-				<view class="goods">
-					<GoodsCard v-for="item in goodsList" :key="item.id" :itemInfo="item" @toDetail="toDetail" />
-				</view>
-			</view>
-		</view>
-	</view>
+              "
+            >
+              <u-icon
+                name="arrow-up-fill"
+                size="6"
+                :color="iconUp == 1 ? '#f83224' : '#303133'"
+              ></u-icon
+              ><u-icon
+                :color="iconUp == 2 ? '#f83224' : '#303133'"
+                size="6"
+                name="arrow-down-fill"
+              ></u-icon>
+            </view>
+          </view>
+        </view>
+        <view class="goods">
+          <GoodsCard
+            v-for="item in goodsList"
+            :key="item.id"
+            :itemInfo="item"
+            @toDetail="toDetail"
+          />
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import GoodsCard from "./component/goodsCard.vue";
-	export default {
-		components: {
-			GoodsCard,
-		},
-		data() {
-			return {
-				value: 4,
-				selectTab: 0,
-				iconUp: 0,
-				isShow: "2", //是否可关注
-				userId: "",
-				userInfo: {}, //用户信息
-				goodsList: [],
-				user_other:{},
-				user_other_no:'',
-				show:''
-			};
-		},
-		onLoad(option) {
-			if (option.page) {
-				this.isShow = option.page;
-			}
-			if (option.user_other) {
-				this.user_other = JSON.parse(decodeURIComponent(option.user_other))
-			}
-			this.show = option.show
-			this.userId = option.merchant_id;
-			this.user_other_no = option.user_other_no
-		},
-		methods: {
-			tochat() {
-				uni.navigateTo({
-					url: '/pageA/chat/chat?user_other=' + encodeURIComponent(JSON.stringify(
-							this.user_other)) + '&user_other_no=' + this.user_other_no
-				})
-			},
-			switchTab(num) {
-				this.selectTab = num;
-				if (num == 4) {
-					// this.iconUp = this.iconUp == 0 ? 1:2
-					// if(this.iconUp == 2){
-					// 	this.iconUp =1
-					// }
-					switch (this.iconUp) {
-						case 1:
-							this.iconUp = 2;
-							break;
-						case 0:
-							this.iconUp = 1;
-							break;
-						case 2:
-							this.iconUp = 1;
-							break;
-					}
-				} else {
-					this.iconUp = 0;
-				}
-			},
-			toDetail(item) {
-				console.log(item);
-				// return;
-				uni.navigateTo({
-					url: `/pageA/productdetails?id=${item.id}`,
-				});
-			},
+import GoodsCard from "./component/goodsCard.vue";
+export default {
+  components: {
+    GoodsCard,
+  },
+  data() {
+    return {
+      value: 4,
+      selectTab: 0,
+      iconUp: 0,
+      isShow: "2", //是否可关注
+      userId: "",
+      userInfo: {}, //用户信息
+      goodsList: [],
+      user_other: {},
+      user_other_no: "",
+      show: "",
+    };
+  },
+  onLoad(option) {
+    if (option.page) {
+      this.isShow = option.page;
+    }
+    if (option.user_other) {
+      this.user_other = JSON.parse(decodeURIComponent(option.user_other));
+    }
+    this.show = option.show;
+    this.userId = option.merchant_id;
+    this.user_other_no = option.user_other_no;
+  },
+  methods: {
+    tochat() {
+      uni.navigateTo({
+        url:
+          "/pageA/chat/chat?user_other=" +
+          encodeURIComponent(JSON.stringify(this.user_other)) +
+          "&user_other_no=" +
+          this.user_other_no,
+      });
+    },
+    switchTab(num) {
+      this.selectTab = num;
+      if (num == 4) {
+        // this.iconUp = this.iconUp == 0 ? 1:2
+        // if(this.iconUp == 2){
+        // 	this.iconUp =1
+        // }
+        switch (this.iconUp) {
+          case 1:
+            this.iconUp = 2;
+            break;
+          case 0:
+            this.iconUp = 1;
+            break;
+          case 2:
+            this.iconUp = 1;
+            break;
+        }
+      } else {
+        this.iconUp = 0;
+      }
+    },
+    toDetail(item) {
+      console.log(item);
+      // return;
+      uni.navigateTo({
+        url: `/pageA/productdetails?id=${item.id}`,
+      });
+    },
 
-			//关注 or 取消关注 店铺
-			followTeam(num) {
-				uni.$u.http
-					.post(`/api/interest/follow`, {
-						interest_type: 1,
-						interest_id: this.userInfo.id,
-					})
-					.then((res) => {
-						this.userInfo.is_interest = num;
-						uni.showToast({
-							title: !num ? "关注成功" : "取消关注",
-							icon: "none",
-						});
-					});
-			},
-			getCommodityList(status = "") {
-				//获取用户信息
-				uni.$u.http
-					.get(`/api/merchant/info?merchant_id=${this.userId}`)
-					.then((res) => {
-						this.userInfo = res;
-					});
+    //关注 or 取消关注 店铺
+    followTeam(num) {
+      uni.$u.http
+        .post(`/api/interest/follow`, {
+          interest_type: 1,
+          interest_id: this.userInfo.id,
+        })
+        .then((res) => {
+          this.userInfo.is_interest = num;
+          uni.showToast({
+            title: !num ? "关注成功" : "取消关注",
+            icon: "none",
+          });
+        });
+    },
+    getCommodityList(status = "") {
+      //获取用户信息
+      uni.$u.http
+        .get(`/api/merchant/info?merchant_id=${this.userId}`)
+        .then((res) => {
+          this.userInfo = res;
+        });
 
-				//获取店铺商品
-				uni.$u.http
-					.post(`/api/goods/merchant_goods`, {
-						page: 1,
-						limit: 10,
-						merchant_id: this.userId,
-						status: status,
-						keywords: this.keywords,
-						source: this.source,
-					})
-					.then((res) => {
-						this.goodsList = res.data;
-					});
-			},
-		},
-		mounted() {
-			this.getCommodityList();
-			//设置顶部导航栏颜色
-			uni.setNavigationBarColor({
-				frontColor: "#ffffff",
-				backgroundColor: "#f74639",
-			});
-		},
-	};
+      //获取店铺商品
+      uni.$u.http
+        .post(`/api/goods/merchant_goods`, {
+          page: 1,
+          limit: 10,
+          merchant_id: this.userId,
+          status: status,
+          keywords: this.keywords,
+          source: this.source,
+        })
+        .then((res) => {
+          this.goodsList = res.data;
+        });
+    },
+  },
+  mounted() {
+    this.getCommodityList();
+    //设置顶部导航栏颜色
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#f74639",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		.shadow {
-			position: absolute;
-			top: 0;
-			height: 300px;
-			width: 100%;
-			background: linear-gradient(#f74639, #f4f4f4);
-			z-index: -1;
-		}
+.page {
+  .shadow {
+    position: absolute;
+    top: 0;
+    height: 300px;
+    width: 100%;
+    background: linear-gradient(#f74639, #f4f4f4);
+    z-index: -1;
+  }
 
-		.content {
-			padding: 20rpx 24rpx;
-			margin-top: 76rpx;
+  .content {
+    padding: 20rpx 24rpx;
+    margin-top: 76rpx;
 
-			.top-information {
-				position: relative;
-				border-radius: 20rpx;
-				background-color: #fff;
-				padding: 28rpx 24rpx;
+    .top-information {
+      position: relative;
+      border-radius: 20rpx;
+      background-color: #fff;
+      padding: 28rpx 24rpx;
 
-				::v-deep .u-icon__icon {
-					color: #f83224 !important;
-				}
+      ::v-deep .u-icon__icon {
+        color: #f83224 !important;
+      }
 
-				.user-header {
-					width: 164rpx;
-					height: 164rpx;
-					border-radius: 50%;
-					border: 2rpx solid #fff;
-					position: absolute;
-					top: -80rpx;
-					left: 28rpx;
-				}
+      .user-header {
+        width: 164rpx;
+        height: 164rpx;
+        border-radius: 50%;
+        border: 2rpx solid #fff;
+        position: absolute;
+        top: -80rpx;
+        left: 28rpx;
+      }
 
-				.btn-list {
-					display: flex;
-					align-items: center;
-					justify-content: flex-end;
-					height: 100rpx;
+      .btn-list {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        height: 100rpx;
 
-					.btn-1 {
-						border: 2rpx solid #f83224;
-						background-color: #fff;
-						color: #f83224;
-						padding: 0;
-						margin: 0;
-						display: flex;
-						justify-content: space-around;
-						align-items: center;
-						height: 52rpx;
-						border-radius: 24rpx;
-						line-height: 52rpx;
-						font-size: 26rpx;
-						padding: 0 28rpx;
-						margin-left: 20rpx;
-					}
-				}
+        .btn-1 {
+          border: 2rpx solid #f83224;
+          background-color: #fff;
+          color: #f83224;
+          padding: 0;
+          margin: 0;
+          display: flex;
+          justify-content: space-around;
+          align-items: center;
+          height: 52rpx;
+          border-radius: 24rpx;
+          line-height: 52rpx;
+          font-size: 26rpx;
+          padding: 0 28rpx;
+          margin-left: 20rpx;
+        }
+      }
 
-				.name {
-					margin-top: 28rpx;
-					font-weight: 600;
-					font-size: 32rpx;
-					color: #333333;
-				}
+      .name {
+        margin-top: 28rpx;
+        font-weight: 600;
+        font-size: 32rpx;
+        color: #333333;
+      }
 
-				.score {
-					width: 30%;
-					height: 28rpx;
-					background-color: rgba(255, 27, 0, 0.1);
-					display: flex;
-					border-radius: 12rpx;
-					margin-top: 16rpx;
-					justify-content: space-around;
+      .score {
+        width: 30%;
+        height: 28rpx;
+        background-color: rgba(255, 27, 0, 0.1);
+        display: flex;
+        border-radius: 12rpx;
+        margin-top: 16rpx;
+        justify-content: space-around;
 
-					.num {
-						font-size: 22rpx;
-						color: #ff1515;
-						font-weight: 600;
-					}
-				}
+        .num {
+          font-size: 22rpx;
+          color: #ff1515;
+          font-weight: 600;
+        }
+      }
 
-				.sale {
-					display: flex;
-					align-items: center;
-					font-size: 24rpx;
-					color: #777;
-					margin-top: 20rpx;
+      .sale {
+        display: flex;
+        align-items: center;
+        font-size: 24rpx;
+        color: #777;
+        margin-top: 20rpx;
 
-					.shu {
-						font-size: 16rpx;
-						color: #979797;
-						opacity: 0.2;
-					}
-				}
-			}
-		}
+        .shu {
+          font-size: 16rpx;
+          color: #979797;
+          opacity: 0.2;
+        }
+      }
+    }
+  }
 
-		.goods-list {
-			border-radius: 20rpx;
-			background-color: #fff;
-			padding: 0 20rpx;
-			margin-top: 20rpx;
+  .goods-list {
+    border-radius: 20rpx;
+    background-color: #fff;
+    padding: 0 20rpx;
+    margin-top: 20rpx;
 
-			.tab-list {
-				height: 96rpx;
-				display: flex;
-				justify-content: space-around;
-				align-items: center;
-				font-size: 26rpx;
-				color: #333333;
-				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-				margin-bottom: 20rpx;
+    .tab-list {
+      height: 96rpx;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      font-size: 26rpx;
+      color: #333333;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+      margin-bottom: 20rpx;
 
-				.tab {
-					color: #000;
-					font-weight: 600;
-				}
+      .tab {
+        color: #000;
+        font-weight: 600;
+      }
 
-				.price {
-					display: flex;
-					align-items: center;
-				}
-			}
+      .price {
+        display: flex;
+        align-items: center;
+      }
+    }
 
-			.goods {
-				display: flex;
-				flex-wrap: wrap;
-				justify-content: space-between;
-			}
-		}
-	}
-</style>
+    .goods {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+    }
+  }
+}
+</style>

+ 10 - 2
pageD/newBulitOrder/component/commodity.vue

@@ -17,9 +17,17 @@
             <text style="font-size: 34rpx">{{ item.sku_item.price }}</text>
           </view>
           <view class="stepping">
-            <u-icon name="minus" size="12"></u-icon>
+            <u-icon
+              name="minus"
+              size="12"
+              @click="$emit('changeGoodsNum', 'reduce')"
+            ></u-icon>
             <text>{{ goodsValue }}</text>
-            <u-icon name="plus" size="12"></u-icon>
+            <u-icon
+              name="plus"
+              size="12"
+              @click="$emit('changeGoodsNum', 'increase')"
+            ></u-icon>
           </view>
         </view>
       </view>

+ 42 - 21
pageD/newBulitOrder/component/goodsInformation.vue

@@ -4,27 +4,22 @@
     <view class="abount" style="margin-top: 20rpx">
       <view class="u-flex u-row-between" style="margin-bottom: 40rpx">
         <view class="name">{{ i18n.Commodityamount }}</view>
-        <view class="money">
-          ¥{{
-            goodinfo.is_discount == 1
-              ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
-              : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
-                10000
-          }}
-        </view>
+        <view class="money"> ¥{{ goodsPrice }} </view>
       </view>
-      <view class="u-flex u-row-between">
+      <view class="u-flex u-row-between" v-if="containname">
         <view class="name">{{ i18n.Grosscommodityweight }}</view>
-        <view class="money">{{ Number(sku_info.weight) * value }}kg</view>
+        <view class="money">{{ goodsWeight * goodsValue }}kg</view>
       </view>
-      <view class="back u-flex" v-if="containname1">
+      <view class="back u-flex" v-if="containname">
         <image
-          src="static/images/warning.png"
+          src="../../../static/images/warning.png"
           style="width: 32rpx; height: 32rpx"
           mode=""
         ></image>
         <text style="margin-left: 12rpx; font-size: 24rpx"
-          >{{ i18n.buy }}{{ max_weight }}kg{{ i18n.price }}¥{{ unit_fee }},{{
+          >{{ i18n.buy }}{{ countGoodsInformation.max_weight }}kg{{
+            i18n.price
+          }}¥{{ countGoodsInformation.unit_fee }},{{
             i18n.morefavorable
           }}</text
         >
@@ -35,25 +30,28 @@
       >
         <view class="name">{{ i18n.Costperkilogram }}</view>
         <view class="money">{{
-          containname1 ? unit_price : i18n.shippingmethod
+          containname ? countGoodsInformation.unit_price : i18n.shippingmethod
         }}</view>
       </view>
       <view class="u-flex u-row-between">
         <view class="name">{{ i18n.freight }}</view>
         <view class="money">{{
-          containname1 ? sum : i18n.shippingmethod
+          containname ? countGoodsInformation.sum : i18n.shippingmethod
         }}</view>
       </view>
       <view class="zong u-flex u-row-right">
         <view class="">
           <text class="small">{{ i18n.subtotal }}</text>
           <text class="mon">¥</text>
-          <text class="mon" style="font-size: 40rpx">{{
+          <!-- <text class="mon" style="font-size: 40rpx">{{
             goodinfo.is_discount == 1
-              ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
-              : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
+              ? (Number(sku_info.price * 100) * Number(goodsValue * 100)) /
                 10000
-          }}</text>
+              : (Number(sku_info.discount_price * 100) *
+                  Number(goodsValue * 100)) /
+                10000
+          }}</text> -->
+          <text class="mon" style="font-size: 40rpx">{{ goodsPrice }}</text>
         </view>
       </view>
     </view>
@@ -74,9 +72,32 @@ export default {
         return {};
       },
     },
-    value: {
+    //货柜名称,用来判断是否已经选择货柜,显示选择货柜之后的内容
+    containname: {
+      typeof: String,
+      default: "",
+    },
+    //商品价格
+    goodsPrice: {
+      typeof: String,
+      default: "",
+    },
+    //选完货柜之后的商品信息
+    countGoodsInformation: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+    //商品数量
+    goodsValue: {
+      typeof: Number,
+      default: 0,
+    },
+    //商品重量
+    goodsWeight: {
       typeof: Number,
-      default: 1,
+      default: 0,
     },
   },
   computed: {

+ 47 - 5
pageD/newBulitOrder/component/nextLogistics.vue

@@ -114,6 +114,9 @@ export default {
       sum: "",
       containid: "",
       datechan: "", //当前选中的货柜列表下标
+      max_weight: "", //推荐重量。当满足当前重量,减少价格
+      min_weight: "",
+      unit_fee: "", //满减价格
     };
   },
   watch: {
@@ -152,6 +155,7 @@ export default {
             }
             this.recommend_weight = this.containerList[0].recommend_weight;
             this.containid = this.containerList[0].id;
+            this.containname = this.containerList[0].name_cn; //等待后续更改language删除掉
             if (this.language == "zh-CN") {
               this.containname = this.containerList[0].name_cn;
             }
@@ -171,9 +175,9 @@ export default {
   },
   methods: {
     //运费满减
-    config() {
+    async config() {
       var that = this;
-      uni.$u.http
+      await uni.$u.http
         .get("/api/config", {
           params: {
             module: "free_shipping",
@@ -185,8 +189,6 @@ export default {
             goodsum =
               (Number(that.sku_info.price * 100) * Number(that.value * 100)) /
               10000;
-            console.log("that.sum", that.sum);
-            console.log("that.goodsum", goodsum);
             if (goodsum > res.free_shipping) {
               that.sum = 0;
               that.unit_price = 0;
@@ -205,9 +207,48 @@ export default {
         .catch(() => {});
     },
 
+    //推荐重量
+    async recommendweight() {
+      await uni.$u.http
+        .get("/api/express-order/recommend-container", {
+          params: {
+            container_id: this.containid,
+            type: "normal",
+          },
+        })
+        .then((res) => {
+          console.log(res);
+          this.max_weight = res.max_weight;
+          this.min_weight = res.min_weight;
+          this.unit_fee = res.unit_fee;
+          console.log(225);
+        })
+        .catch(() => {});
+    },
     //确定选择货柜
     confirm() {
-      this.$emit("closeLogistics");
+      this.recommendweight();
+      // this.config();
+      //异步跳转
+      const timer = setTimeout(() => {
+        let data = {
+          type: "second",
+          containname: this.containname,
+          containid: this.containid,
+          recommend_weight: this.recommend_weight,
+          unit_price: this.unit_price,
+          sum: this.sum,
+          max_weight: this.max_weight,
+          min_weight: this.min_weight,
+          unit_fee: this.unit_fee,
+        };
+        console.log(247);
+        console.log(data);
+        console.log(this.max_weight);
+        console.log(data.max_weight);
+        this.$emit("closeLogistics", data);
+        clearTimeout(timer);
+      }, 200);
     },
 
     activea(item, idx) {
@@ -216,6 +257,7 @@ export default {
       this.unit_price = item.unit_price;
       this.recommend_weight = item.recommend_weight;
       this.containid = item.id;
+      this.containname = item.name_cn; //等待后续更改language删除掉
       if (this.language == "zh-CN") {
         this.containname = item.name_cn;
       }

+ 5 - 2
pageD/newBulitOrder/component/selectLogistics.vue

@@ -105,8 +105,11 @@ export default {
   methods: {
     next() {
       console.log(this.transportTypeName);
-      return;
-      this.$emit("openContainer");
+      let data = {
+        transportTypeName: this.transportTypeName,
+        type: "first",
+      };
+      this.$emit("openContainer", data);
     },
     change(item, index) {
       this.transport_type_id = item.id;

+ 44 - 7
pageD/newBulitOrder/newBulitOrder.vue

@@ -19,7 +19,11 @@
     <!-- 地址 -->
 
     <!-- 需要下单的商品列表 -->
-    <Commodity :goodsList="goodsList" :goodsValue="goodsValue" />
+    <Commodity
+      :goodsList="goodsList"
+      :goodsValue="goodsValue"
+      @changeGoodsNum="changeGoodsNum"
+    />
     <!-- 需要下单的商品列表 -->
 
     <!-- 选择物流 -->
@@ -59,13 +63,20 @@
     <!-- 推荐商品 -->
 
     <!-- 商品信息 -->
-    <GoodsInformation :goodinfo="goodinfo" />
+    <GoodsInformation
+      :goodinfo="goodinfo"
+      :containname="containname"
+      :goodsPrice="goodsList.order.amount"
+      :countGoodsInformation="countGoodsInformation"
+      :goodsValue="goodsValue"
+      :goodsWeight="goodsWeight"
+    />
     <!-- 商品信息 -->
 
     <view class="btn u-flex u-row-right">
       <view class="u-flex">
-        <text class="kg"
-          >{{ i18n.Atotalof }}{{ Number(sku_info.weight) * value }}kg,</text
+        <text class="kg" v-show="containname"
+          >{{ i18n.Atotalof }}{{ goodsWeight * goodsValue }}kg,</text
         >
         <text>{{ i18n.total }}:</text>
         <text class="money" style="font-size: 28rpx">¥</text>
@@ -77,7 +88,8 @@
             style="font-weight: bold"
             >{{
               Number(
-                sum * 10000 + Number(sku_info.price) * Number(value) * 10000
+                countGoodsInformation.sum * 10000 +
+                  Number(sku_info.price) * Number(goodsValue) * 10000
               ) / 10000
             }}</text
           >
@@ -87,8 +99,8 @@
             style="font-weight: bold"
             >{{
               Number(
-                sum * 10000 +
-                  Number(sku_info.discount_price) * Number(value) * 10000
+                countGoodsInformation.sum * 10000 +
+                  Number(sku_info.discount_price) * Number(goodsValue) * 10000
               ) / 10000
             }}</text
           >
@@ -131,6 +143,8 @@ export default {
       goodsValue: 0, //商品数量
       sku_info: {},
       containname: "", //货柜名称
+      countGoodsInformation: {},
+      goodsWeight: 0, //商品重量
     };
   },
   computed: {
@@ -139,8 +153,10 @@ export default {
     },
   },
   onLoad(options) {
+    //需要下单的商品列表
     this.goodsList = JSON.parse(decodeURIComponent(options.goodsList));
     this.goodsValue = this.goodsList.order_goods[0].goods_num;
+    this.goodsWeight = this.goodsList.order_goods[0].sku_item.weight;
     this.recommend();
   },
   onShow() {
@@ -153,6 +169,11 @@ export default {
     closeLogistics(data) {
       this.logisticsShow = false;
       this.nextLogisticsShow = false;
+      //判断是哪一步关闭,接受数据
+      if (data.type == "second" && data.containname) {
+        this.containname = data.containname;
+        this.countGoodsInformation = data;
+      }
     },
 
     //打开选择货柜弹窗
@@ -183,6 +204,11 @@ export default {
       console.log(this.goodinfo);
       this.logisticsShow = false;
       this.nextLogisticsShow = true;
+
+      //判断打开的窗口是第几步,将选中的运输方式传回
+      if (data.type == "first" && data.transportTypeName) {
+        this.transportTypeName = data.transportTypeName;
+      }
     },
 
     //打开选择物流窗口
@@ -190,6 +216,7 @@ export default {
       this.logisticsShow = true;
       this.transport();
     },
+
     //跳转到填写地址
     toadd() {
       var that = this;
@@ -253,6 +280,15 @@ export default {
         })
         .catch(() => {});
     },
+
+    //增加 or 减少 商品数量
+    changeGoodsNum(type) {
+      if (type == "increase") {
+        this.goodsValue++;
+      } else {
+        this.goodsValue--;
+      }
+    },
   },
 };
 </script>
@@ -262,6 +298,7 @@ export default {
   background: rgba(244, 244, 244, 1);
   padding: 20rpx 24rpx;
   box-sizing: border-box;
+  padding-bottom: 200rpx;
   // 地址
   .address {
     width: 702rpx;

+ 4 - 3
pageD/orderDetail/orderDetail.vue

@@ -101,13 +101,13 @@
       >
         缴纳保证金
       </button>
-      <button
+      <!-- <button
         class="status-1"
         v-if="orderDetail.status == 'merdelivered'"
         @click="addRemark"
       >
         备注
-      </button>
+      </button> -->
       <button
         class="status-2"
         @click="toSendOutGoods"
@@ -130,7 +130,7 @@
       </button> -->
     </view>
 
-    <Remark :show="remarkShow" @close="remarkClose" />
+    <Remark :show="remarkShow" @remarkClose="remarkClose" />
   </view>
 </template>
 
@@ -194,6 +194,7 @@ export default {
     //关闭备注弹框
     remarkClose(value) {
       this.remarkShow = false;
+      console.log(this.remarkShow);
       //没有接口,有接口再补充
       if (value) {
       }

+ 2 - 2
pageD/orderFormManage/component/detailCard.vue

@@ -70,9 +70,9 @@
       >
         缴纳保证金
       </button>
-      <button class="btn-2" v-if="itemInfo.simplify_status == 'merdelivered'">
+      <!-- <button class="btn-2" v-if="itemInfo.simplify_status == 'merdelivered'">
         备注
-      </button>
+      </button> -->
       <button
         class="btn-1"
         v-if="itemInfo.simplify_status == 'merdelivered'"

+ 14 - 0
pageD/orderFormManage/orderFormManage.vue

@@ -58,20 +58,24 @@
         <DetailCard :itemInfo="item" @toInformation="toInformation" />
       </view>
     </view>
+    <Remark :show="remarkShow" @remarkClose="remarkClose" />
   </view>
 </template>
 
 <script>
 import DetailCard from "./component/detailCard.vue";
+import Remark from "../components/remark.vue";
 export default {
   components: {
     DetailCard,
+    Remark,
   },
   data() {
     return {
       follow: "",
       orderList: [],
       page: 1,
+      remarkShow: false,
     };
   },
   onShow() {
@@ -82,6 +86,16 @@ export default {
       this.follow = num;
       this.getGoodsList();
     },
+
+    //关闭备注弹框
+    remarkClose(value) {
+      this.remarkShow = false;
+      console.log(this.remarkShow);
+      //没有接口,有接口再补充
+      if (value) {
+      }
+    },
+
     toInformation(item) {
       if (item.status == "unreview") return;
       uni.navigateTo({

+ 2 - 1
pageD/orderInformation/orderInformation.vue

@@ -119,7 +119,7 @@
             <text
               >{{ orderInformation.transportType.name_cn + "&nbsp;" }}
             </text>
-            <text> | {{ orderInformation.containerBase.name }}</text>
+            <text> | {{ orderInformation.containerBase.name_cn }}</text>
           </view>
         </view>
       </view>
@@ -448,6 +448,7 @@ export default {
 .page {
   padding: 20rpx 24rpx;
   position: relative;
+  padding-bottom: 186rpx;
 
   .title {
     font-size: 44rpx;

+ 37 - 1
pageD/productDetails/productDetails.vue

@@ -89,7 +89,8 @@
       class="footer"
       v-if="
         (!downOrGrounding || pageStatus == 'platform') &&
-        commodityDetail.final_status != 'unreview'
+        commodityDetail.final_status != 'unreview' &&
+        pageStatus != 'supply'
       "
     >
       <!-- <button class="btn">编辑商品</button> -->
@@ -102,6 +103,26 @@
       </button>
       <button class="btn" v-else @click="groundingCommodity">上架商品</button>
     </view>
+    <view
+      class="footer"
+      v-if="
+        pageStatus == 'supply' && commodityDetail.final_status != 'unreview'
+      "
+    >
+      <button
+        class="btn"
+        v-if="commodityDetail.status == 'down'"
+        @click="supplyChain('normal')"
+      >
+        上架商品</button
+      ><button
+        class="btn"
+        v-if="commodityDetail.status == 'normal'"
+        @click="supplyChain('down')"
+      >
+        下架商品
+      </button></view
+    >
   </view>
 </template>
 
@@ -143,6 +164,21 @@ export default {
   },
   methods: {
     rightClick() {},
+    // 上架 or 下架 供应链商品
+    supplyChain(status) {
+      uni.$u.http
+        .post(`/api/goods/supply_status`, {
+          goods_id: this.commodityDetail.id,
+          status,
+        })
+        .then((res) => {
+          this.getGoodsDetail();
+          uni.showToast({
+            title: status == "down" ? "下架成功" : "上架成功",
+            icon: "none",
+          });
+        });
+    },
     //获取平台库商品详情
     getGoodsDetail() {
       uni.$u.http

+ 13 - 2
pageD/supplyChainGoods/supplyChainGoods.vue

@@ -111,7 +111,6 @@ export default {
     },
     //搜索
     search(e) {
-      console.log(e);
       this.getinfoList();
     },
     //获取供应链商品列表
@@ -135,9 +134,21 @@ export default {
         this.goodsList = res.data;
       });
     },
+
     //商品上架,下架
     goodsUpDown(value, item) {
-      // uni.#u.http.post(``)
+      uni.$u.http
+        .post(`/api/goods/supply_status`, {
+          goods_id: item.id,
+          status: value,
+        })
+        .then((res) => {
+          this.getinfoList();
+          uni.showToast({
+            title: value == "down" ? "下架成功" : "上架成功",
+            icon: "none",
+          });
+        });
     },
   },
   mounted() {

BIN
static/images/warning.png


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/common/runtime.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/balance.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"0148":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u},"2a70":function(e,n,t){"use strict";t.r(n);var u=t("0148"),a=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(r);n["default"]=a.a},5536:function(e,n,t){"use strict";t.r(n);var u=t("cdee"),a=t("2a70");for(var r in a)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(r);var c,f=t("f0c5"),i=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},5605:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var a=u(t("5536"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},cdee:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var a=function(){var e=this,n=e.$createElement;e._self._c},r=[]}},[["5605","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"038d":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}}}},"2ecb":function(e,n,t){"use strict";t.r(n);var u=t("038d"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=a.a},4470:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},a=[]},7055:function(e,n,t){"use strict";t.r(n);var u=t("4470"),a=t("2ecb");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);var r=t("828b"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=i.exports},c9be:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("7055"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["c9be","common/runtime","common/vendor"]]]);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/changelange.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 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/comment.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/confirm.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{6491:function(n,e,t){"use strict";t.r(e);var r=t("92df"),u=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(a);e["default"]=u.a},"68df":function(n,e,t){"use strict";var r;t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},a=[]},"6e3d":function(n,e,t){"use strict";t.r(e);var r=t("68df"),u=t("6491");for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);t("731b");var f,c=t("f0c5"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"95fe1fe2",null,!1,r["a"],f);e["default"]=i.exports},"731b":function(n,e,t){"use strict";var r=t("fbaa"),u=t.n(r);u.a},"8a38":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var u=r(t("6e3d"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"92df":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{orderinfo:function(){n.reLaunch({url:"/pageC/orderForm/orderForm"})},toindex:function(){n.switchTab({url:"/pages/index/index"})}}};e.default=t}).call(this,t("543d")["default"])},fbaa:function(n,e,t){}},[["8a38","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{"10a7":function(n,e,t){"use strict";t.r(e);var r=t("5e18"),u=t("53f3");for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);t("586e");var c=t("828b"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"95fe1fe2",null,!1,r["a"],void 0);e["default"]=i.exports},"29cd":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{orderinfo:function(){n.reLaunch({url:"/pageC/orderForm/orderForm"})},toindex:function(){n.switchTab({url:"/pages/index/index"})}}};e.default=t}).call(this,t("df3c")["default"])},"53f3":function(n,e,t){"use strict";t.r(e);var r=t("29cd"),u=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(a);e["default"]=u.a},"586e":function(n,e,t){"use strict";var r=t("a4b0"),u=t.n(r);u.a},"5e18":function(n,e,t){"use strict";t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){}));var r=function(){var n=this.$createElement;this._self._c},u=[]},a4b0:function(n,e,t){},fdd5:function(n,e,t){"use strict";(function(n,e){var r=t("47a9");t("abeb");r(t("3240"));var u=r(t("10a7"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["fdd5","common/runtime","common/vendor"]]]);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/counter.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/counter.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/index.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"0387":function(e,t,n){"use strict";var a=n("b61b"),r=n.n(a);r.a},"73d5":function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){return a}));var r=function(){var e=this,t=e.$createElement;e._self._c},c=[]},b00b:function(e,t,n){"use strict";n.r(t);var a=n("73d5"),r=n("e3c0");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("0387");var o,u=n("f0c5"),i=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],o);t["default"]=i.exports},b61b:function(e,t,n){},cde8:function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("f93b");a(n("66fd"));var r=a(n("b00b"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},e3c0:function(e,t,n){"use strict";n.r(t);var a=n("f05a"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f05a:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a}},[["cde8","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"9c25":function(e,t,n){},"9f3f":function(e,t,n){"use strict";n.r(t);var a=n("f6eb"),r=n("e35d");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("a165");var o=n("828b"),u=Object(o["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);t["default"]=u.exports},a165:function(e,t,n){"use strict";var a=n("9c25"),r=n.n(a);r.a},a412:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a},ca23:function(e,t,n){"use strict";(function(e,t){var a=n("47a9");n("abeb");a(n("3240"));var r=a(n("9f3f"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},e35d:function(e,t,n){"use strict";n.r(t);var a=n("a412"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f6eb:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return r})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},r=[]}},[["ca23","common/runtime","common/vendor"]]]);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/logisticsinfo.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxss


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 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-e70e993a{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-e70e993a{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-e70e993a{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-e70e993a{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-e70e993a{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-e70e993a{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-e70e993a{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-e70e993a{position:relative}.back .topbox .state.data-v-e70e993a{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-e70e993a{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-e70e993a{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-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-72b6ab28{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-72b6ab28{position:relative}.back .topbox .state.data-v-72b6ab28{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-72b6ab28{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-72b6ab28{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/productdetails.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/rule/rule.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/shoplist.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/shoplist.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/shoptype.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/subsidy.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/subsidy.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/Senderinfor.js


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

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

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/account.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/account.wxml


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

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

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/delivery.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/delivery.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 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/expresstype.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/goods.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/goods.wxml


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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{"37ba":function(e,n,t){"use strict";t.r(n);var u=t("c91e"),r=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=r.a},"6f72":function(e,n,t){"use strict";t.r(n);var u=t("72bd"),r=t("37ba");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);var c,f=t("f0c5"),i=Object(f["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},"72bd":function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var r=function(){var e=this,n=e.$createElement;e._self._c},a=[]},"748e":function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var r=u(t("6f72"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},c91e:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u}},[["748e","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{1260:function(n,t,e){"use strict";e.r(t);var u=e("23f4"),a=e("8646");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);var c=e("828b"),f=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);t["default"]=f.exports},"23f4":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},3201:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{}}}},5459:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var a=u(e("1260"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},8646:function(n,t,e){"use strict";e.r(t);var u=e("3201"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a}},[["5459","common/runtime","common/vendor"]]]);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/list/list.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/myPackage.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/myPackage.wxml


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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"147a":function(n,e,t){},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"5abc":function(n,e,t){"use strict";var r=t("147a"),o=t.n(r);o.a},8079:function(n,e,t){"use strict";t.r(e);var r=t("9789"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("5abc");var i,a=t("f0c5"),c=Object(a["a"])(o["default"],r["b"],r["c"],!1,null,"66b183e6",null,!1,r["a"],i);e["default"]=c.exports},9789:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"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.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("543d")["default"])},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"235c":function(n,t,e){"use strict";e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return i})),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,"f3ae"))}},r=function(){var n=this.$createElement;this._self._c},i=[]},"25fa":function(n,t,e){"use strict";e.r(t);var o=e("235c"),r=e("a9d5");for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);e("2734");var u=e("828b"),a=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,"66b183e6",null,!1,o["a"],void 0);t["default"]=a.exports},2734:function(n,t,e){"use strict";var o=e("af40"),r=e.n(o);r.a},"8b5a":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.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};t.default=e}).call(this,e("df3c")["default"])},"8d8c":function(n,t,e){"use strict";(function(n,t){var o=e("47a9");e("abeb");o(e("3240"));var r=o(e("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(r.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},a9d5:function(n,t,e){"use strict";e.r(t);var o=e("8b5a"),r=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);t["default"]=r.a},af40:function(n,t,e){}},[["8d8c","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"42cf":function(t,n,e){"use strict";var i=e("55bd"),a=e.n(i);a.a},4539:function(t,n,e){"use strict";e.r(n);var i=e("46b3"),a=e("4b1a");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("42cf");var o,u=e("f0c5"),r=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],o);n["default"]=r.exports},"46b3":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"4b1a":function(t,n,e){"use strict";e.r(n);var i=e("c4b0"),a=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=a.a},"55bd":function(t,n,e){},c4b0:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("543d")["default"])},f791:function(t,n,e){"use strict";(function(t,n){var i=e("4ea4");e("f93b");i(e("66fd"));var a=i(e("4539"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])}},[["f791","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"0946":function(t,n,e){"use strict";var i=e("22f4"),a=e.n(i);a.a},"0985":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("df3c")["default"])},1668:function(t,n,e){"use strict";e.r(n);var i=e("d77d"),a=e("f0b3");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("0946");var c=e("828b"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],void 0);n["default"]=u.exports},"22f4":function(t,n,e){},"51a4":function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var a=i(e("1668"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},d77d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},a=[]},f0b3:function(t,n,e){"use strict";e.r(n);var i=e("0985"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}},[["51a4","common/runtime","common/vendor"]]]);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/search.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/search.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/accountBalance/accountBalance.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pageC/accountCancellation/accountCancellation.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"0b93":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uModal:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-modal/u-modal")]).then(e.bind(null,"7b40"))}},o=function(){var n=this,t=n.$createElement;n._self._c;n._isMounted||(n.e0=function(t){n.show=!0},n.e1=function(t){n.show=!1})},c=[]},"2b77":function(n,t,e){"use strict";e.r(t);var u=e("8416"),o=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"]=o.a},4201:function(n,t,e){},"7f70":function(n,t,e){"use strict";var u=e("4201"),o=e.n(u);o.a},8416:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{show:!1}},computed:{i18n:function(){return this.$t("index")}},methods:{logout:function(){this.show=!1}}};t.default=u},aa81:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var o=u(e("c805"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(o.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},c805:function(n,t,e){"use strict";e.r(t);var u=e("0b93"),o=e("2b77");for(var c in o)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(c);e("7f70");var a,i=e("f0c5"),r=Object(i["a"])(o["default"],u["b"],u["c"],!1,null,"08d147db",null,!1,u["a"],a);t["default"]=r.exports}},[["aa81","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"1ad5":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var u={uModal:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-modal/u-modal")]).then(e.bind(null,"6c25"))}},o=function(){var n=this,t=n.$createElement;n._self._c;n._isMounted||(n.e0=function(t){n.show=!0},n.e1=function(t){n.show=!1})},a=[]},"4c53":function(n,t,e){},"4d1a":function(n,t,e){"use strict";e.r(t);var u=e("1ad5"),o=e("9d78");for(var a in o)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(a);e("5aad");var c=e("828b"),i=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"08d147db",null,!1,u["a"],void 0);t["default"]=i.exports},"5aad":function(n,t,e){"use strict";var u=e("4c53"),o=e.n(u);o.a},"9d78":function(n,t,e){"use strict";e.r(t);var u=e("ece0"),o=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=o.a},ebe6:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var o=u(e("4d1a"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(o.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},ece0:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{show:!1}},computed:{i18n:function(){return this.$t("index")}},methods:{logout:function(){this.show=!1}}}}},[["ebe6","common/runtime","common/vendor"]]]);

+ 1 - 1
unpackage/dist/build/mp-weixin/pageC/accountSecurity/accountSecurity.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/accountSecurity"],{"034c":function(t,n,c){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e=function(){c.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(c("ac58"))}.bind(null,c)).catch(c.oe)},a={data:function(){return{}},components:{textRight:e},computed:{i18n:function(){return this.$t("index")}},methods:{toCancellation:function(){t.navigateTo({url:"/pageC/accountCancellation/accountCancellation"})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.account})}};n.default=a}).call(this,c("543d")["default"])},"8b1a":function(t,n,c){"use strict";(function(t,n){var e=c("4ea4");c("f93b");e(c("66fd"));var a=e(c("92a1"));t.__webpack_require_UNI_MP_PLUGIN__=c,n(a.default)}).call(this,c("bc2e")["default"],c("543d")["createPage"])},"8c01":function(t,n,c){"use strict";var e=c("d7c0"),a=c.n(e);a.a},"92a1":function(t,n,c){"use strict";c.r(n);var e=c("b9cf"),a=c("b252");for(var u in a)["default"].indexOf(u)<0&&function(t){c.d(n,t,(function(){return a[t]}))}(u);c("8c01");var i,o=c("f0c5"),r=Object(o["a"])(a["default"],e["b"],e["c"],!1,null,"5c759582",null,!1,e["a"],i);n["default"]=r.exports},b252:function(t,n,c){"use strict";c.r(n);var e=c("034c"),a=c.n(e);for(var u in e)["default"].indexOf(u)<0&&function(t){c.d(n,t,(function(){return e[t]}))}(u);n["default"]=a.a},b9cf:function(t,n,c){"use strict";var e;c.d(n,"b",(function(){return a})),c.d(n,"c",(function(){return u})),c.d(n,"a",(function(){return e}));var a=function(){var t=this,n=t.$createElement;t._self._c},u=[]},d7c0:function(t,n,c){}},[["8b1a","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/accountSecurity"],{"13eb":function(t,n,e){"use strict";e.r(n);var c=e("58a4"),u=e.n(c);for(var a in c)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(a);n["default"]=u.a},"41d8":function(t,n,e){"use strict";(function(t,n){var c=e("47a9");e("abeb");c(e("3240"));var u=c(e("cc4c"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},"58a4":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var c={data:function(){return{}},components:{textRight:function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("b162"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},methods:{toCancellation:function(){t.navigateTo({url:"/pageC/accountCancellation/accountCancellation"})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.account})}};n.default=c}).call(this,e("df3c")["default"])},"72d8":function(t,n,e){"use strict";var c=e("be99"),u=e.n(c);u.a},9821:function(t,n,e){"use strict";e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var c=function(){var t=this.$createElement;this._self._c},u=[]},be99:function(t,n,e){},cc4c:function(t,n,e){"use strict";e.r(n);var c=e("9821"),u=e("13eb");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("72d8");var i=e("828b"),o=Object(i["a"])(u["default"],c["b"],c["c"],!1,null,"5c759582",null,!1,c["a"],void 0);n["default"]=o.exports}},[["41d8","common/runtime","common/vendor"]]]);

+ 2 - 2
unpackage/dist/build/mp-weixin/pageC/accountSecurity/component/textRight.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{"1fb2":function(t,n,e){"use strict";e.r(n);var u=e("9577"),c=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);n["default"]=c.a},"44b1":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return u}));var c=function(){var t=this,n=t.$createElement;t._self._c},r=[]},"773c":function(t,n,e){"use strict";var u=e("c0a5"),c=e.n(u);c.a},9577:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}},props:{texts:{typeof:String,default:""}}};n.default=u},ac58:function(t,n,e){"use strict";e.r(n);var u=e("44b1"),c=e("1fb2");for(var r in c)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(r);e("773c");var a,f=e("f0c5"),i=Object(f["a"])(c["default"],u["b"],u["c"],!1,null,"098f0a2c",null,!1,u["a"],a);n["default"]=i.exports},c0a5:function(t,n,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{"068f":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}},props:{texts:{typeof:String,default:""}}};n.default=u},"0bff":function(t,n,e){"use strict";var u=e("5373"),f=e.n(u);f.a},"1be4":function(t,n,e){"use strict";e.r(n);var u=e("068f"),f=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);n["default"]=f.a},5373:function(t,n,e){},9565:function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return f})),e.d(n,"a",(function(){}));var u=function(){var t=this.$createElement;this._self._c},f=[]},b162:function(t,n,e){"use strict";e.r(n);var u=e("9565"),f=e("1be4");for(var r in f)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return f[t]}))}(r);e("0bff");var a=e("828b"),c=Object(a["a"])(f["default"],u["b"],u["c"],!1,null,"098f0a2c",null,!1,u["a"],void 0);n["default"]=c.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/accountSecurity/component/textRight-create-component',
     {
         'pageC/accountSecurity/component/textRight-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("ac58"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("b162"))
         })
     },
     [['pageC/accountSecurity/component/textRight-create-component']]

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"58a5":function(t,n,e){"use strict";e.r(n);var u=e("e7dd"),a=e.n(u);for(var o in u)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(o);n["default"]=a.a},"67dc":function(t,n,e){"use strict";e.r(n);var u=e("8118"),a=e("58a5");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("fd8c");var i,c=e("f0c5"),r=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"71c8c3a6",null,!1,u["a"],i);n["default"]=r.exports},8118:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return u}));var a=function(){var t=this,n=t.$createElement;t._self._c},o=[]},8135:function(t,n,e){},"9e36":function(t,n,e){"use strict";(function(t,n){var u=e("4ea4");e("f93b");u(e("66fd"));var a=u(e("67dc"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},e7dd:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=e("970c"),a=function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("edae"))}.bind(null,e)).catch(e.oe)},o={components:{AllRight:a},computed:{i18n:function(){return this.$t("index")}},onShow:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"}),u.conn.close()},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=o}).call(this,e("543d")["default"])},fd8c:function(t,n,e){"use strict";var u=e("8135"),a=e.n(u);a.a}},[["9e36","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"4c51":function(t,n,e){"use strict";e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){}));var c=function(){var t=this.$createElement;this._self._c},i=[]},"56cc":function(t,n,e){"use strict";var c=e("d0c4"),i=e.n(c);i.a},"8edf":function(t,n,e){"use strict";e.r(n);var c=e("4c51"),i=e("9825");for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);e("56cc");var u=e("828b"),a=Object(u["a"])(i["default"],c["b"],c["c"],!1,null,"71c8c3a6",null,!1,c["a"],void 0);n["default"]=a.exports},9443:function(t,n,e){"use strict";(function(t,n){var c=e("47a9");e("abeb");c(e("3240"));var i=c(e("8edf"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(i.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},9825:function(t,n,e){"use strict";e.r(n);var c=e("d786"),i=e.n(c);for(var o in c)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(o);n["default"]=i.a},d0c4:function(t,n,e){},d786:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var c=e("bab7"),i={components:{AllRight:function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("2c60"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"}),c.conn.close()},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=i}).call(this,e("df3c")["default"])}},[["9443","common/runtime","common/vendor"]]]);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/addEditAddress/component/selectCity.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/addressManagement/addressManagement.js


+ 2 - 2
unpackage/dist/build/mp-weixin/pageC/addressManagement/component/address.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{"0efd":function(e,n,t){"use strict";var u=t("2608"),r=t.n(u);r.a},"129f":function(e,n,t){"use strict";t.r(n);var u=t("ee05"),r=t("be73");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);t("0efd");var f,c=t("f0c5"),i=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"2d6103bc",null,!1,u["a"],f);n["default"]=i.exports},2608:function(e,n,t){},6240:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};n.default=u},be73:function(e,n,t){"use strict";t.r(n);var u=t("6240"),r=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=r.a},ee05:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var r=function(){var e=this,n=e.$createElement;e._self._c},a=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{"0e5d":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};t.default=u},4402:function(n,t,e){"use strict";var u=e("5af0"),a=e.n(u);a.a},"5af0":function(n,t,e){},6780:function(n,t,e){"use strict";e.r(t);var u=e("0e5d"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a},"884b":function(n,t,e){"use strict";e.r(t);var u=e("cf54"),a=e("6780");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);e("4402");var c=e("828b"),f=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"2d6103bc",null,!1,u["a"],void 0);t["default"]=f.exports},cf54:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/addressManagement/component/address-create-component',
     {
         'pageC/addressManagement/component/address-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("129f"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("884b"))
         })
     },
     [['pageC/addressManagement/component/address-create-component']]

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.wxss


+ 2 - 2
unpackage/dist/build/mp-weixin/pageC/applicationRefund/component/reasonPopup.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/applicationRefund/component/reasonPopup"],{"07f8":function(n,e,o){"use strict";o.r(e);var u=o("b4df"),t=o("4e66");for(var i in t)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return t[n]}))}(i);o("e2ae");var r,a=o("f0c5"),c=Object(a["a"])(t["default"],u["b"],u["c"],!1,null,"2f747a63",null,!1,u["a"],r);e["default"]=c.exports},"1c8c":function(n,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(n){console.log(this.value),this.$emit("close",n)}}};e.default=u},"4e66":function(n,e,o){"use strict";o.r(e);var u=o("1c8c"),t=o.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return u[n]}))}(i);e["default"]=t.a},"78c8":function(n,e,o){},b4df:function(n,e,o){"use strict";o.d(e,"b",(function(){return t})),o.d(e,"c",(function(){return i})),o.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-popup/u-popup")]).then(o.bind(null,"2f21"))},uRadioGroup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio-group/u-radio-group")]).then(o.bind(null,"fdad"))},uRadio:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio/u-radio")]).then(o.bind(null,"d94c"))}},t=function(){var n=this,e=n.$createElement;n._self._c},i=[]},e2ae:function(n,e,o){"use strict";var u=o("78c8"),t=o.n(u);t.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/applicationRefund/component/reasonPopup"],{8006:function(n,e,o){"use strict";o.r(e);var u=o("b63b"),t=o("f2b2");for(var i in t)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return t[n]}))}(i);o("a893");var a=o("828b"),r=Object(a["a"])(t["default"],u["b"],u["c"],!1,null,"2f747a63",null,!1,u["a"],void 0);e["default"]=r.exports},a893:function(n,e,o){"use strict";var u=o("d3ae"),t=o.n(u);t.a},b63b:function(n,e,o){"use strict";o.d(e,"b",(function(){return t})),o.d(e,"c",(function(){return i})),o.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-popup/u-popup")]).then(o.bind(null,"f1b1"))},uRadioGroup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio-group/u-radio-group")]).then(o.bind(null,"02ee"))},uRadio:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio/u-radio")]).then(o.bind(null,"634f"))}},t=function(){var n=this.$createElement;this._self._c},i=[]},d3ae:function(n,e,o){},f2b2:function(n,e,o){"use strict";o.r(e);var u=o("f2ba"),t=o.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return u[n]}))}(i);e["default"]=t.a},f2ba:function(n,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(n){console.log(this.value),this.$emit("close",n)}}};e.default=u}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/applicationRefund/component/reasonPopup-create-component',
     {
         'pageC/applicationRefund/component/reasonPopup-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("07f8"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("8006"))
         })
     },
     [['pageC/applicationRefund/component/reasonPopup-create-component']]

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.