Kaynağa Gözat

解决冲突

zhaogongxue 7 ay önce
ebeveyn
işleme
75046de7a6
100 değiştirilmiş dosya ile 453 ekleme ve 462 silme
  1. 1 1
      manifest.json
  2. 1 1
      pageA/chat/chat.vue
  3. 1 1
      pageA/chat/news.vue
  4. 1 1
      pageA/service/service.vue
  5. 229 226
      pageC/refundDetail/component/refundInformation.vue
  6. 30 11
      pages/express/express.vue
  7. 47 8
      pages/index/index.vue
  8. 113 151
      pages/mine/component/teamFunction.vue
  9. 0 0
      unpackage/dist/build/mp-weixin/common/main.js
  10. 0 1
      unpackage/dist/build/mp-weixin/common/runtime.js
  11. 0 1
      unpackage/dist/build/mp-weixin/common/vendor.js
  12. 0 0
      unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.js
  13. 0 0
      unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.js
  14. 0 0
      unpackage/dist/build/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js
  15. 1 1
      unpackage/dist/build/mp-weixin/pageA/balance.js
  16. 0 0
      unpackage/dist/build/mp-weixin/pageA/changelange.js
  17. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  18. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml
  19. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  20. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.wxml
  21. 0 1
      unpackage/dist/build/mp-weixin/pageA/comment.js
  22. 1 1
      unpackage/dist/build/mp-weixin/pageA/confirm.js
  23. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.js
  24. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.wxml
  25. 1 1
      unpackage/dist/build/mp-weixin/pageA/index.js
  26. 0 0
      unpackage/dist/build/mp-weixin/pageA/logisticsinfo.js
  27. 0 1
      unpackage/dist/build/mp-weixin/pageA/order.js
  28. 0 1
      unpackage/dist/build/mp-weixin/pageA/order.wxml
  29. 0 1
      unpackage/dist/build/mp-weixin/pageA/order.wxss
  30. 0 1
      unpackage/dist/build/mp-weixin/pageA/payorder.js
  31. 0 1
      unpackage/dist/build/mp-weixin/pageA/payorder.wxml
  32. 1 5
      unpackage/dist/build/mp-weixin/pageA/payorder.wxss
  33. 0 1
      unpackage/dist/build/mp-weixin/pageA/productdetails.js
  34. 0 1
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxml
  35. 0 0
      unpackage/dist/build/mp-weixin/pageA/rule/rule.js
  36. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.js
  37. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.wxml
  38. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoplist.js
  39. 0 0
      unpackage/dist/build/mp-weixin/pageA/shoplist.wxml
  40. 0 1
      unpackage/dist/build/mp-weixin/pageA/shoptype.js
  41. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.js
  42. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.wxml
  43. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js
  44. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml
  45. 0 0
      unpackage/dist/build/mp-weixin/pageB/Senderinfor.js
  46. 1 1
      unpackage/dist/build/mp-weixin/pageB/Senderinfor.wxml
  47. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.js
  48. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.wxml
  49. 1 1
      unpackage/dist/build/mp-weixin/pageB/citychange.js
  50. 0 0
      unpackage/dist/build/mp-weixin/pageB/delivery.js
  51. 0 0
      unpackage/dist/build/mp-weixin/pageB/delivery.wxml
  52. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.js
  53. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxml
  54. 0 0
      unpackage/dist/build/mp-weixin/pageB/expresstype.js
  55. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.js
  56. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.wxml
  57. 1 1
      unpackage/dist/build/mp-weixin/pageB/index.js
  58. 0 0
      unpackage/dist/build/mp-weixin/pageB/list/list.js
  59. 0 0
      unpackage/dist/build/mp-weixin/pageB/myPackage.js
  60. 0 0
      unpackage/dist/build/mp-weixin/pageB/myPackage.wxml
  61. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.js
  62. 1 1
      unpackage/dist/build/mp-weixin/pageB/parcel.js
  63. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.js
  64. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml
  65. 0 0
      unpackage/dist/build/mp-weixin/pageB/search.js
  66. 0 1
      unpackage/dist/build/mp-weixin/pageB/search.wxml
  67. 0 0
      unpackage/dist/build/mp-weixin/pageC/accountBalance/accountBalance.js
  68. 1 1
      unpackage/dist/build/mp-weixin/pageC/accountCancellation/accountCancellation.js
  69. 1 1
      unpackage/dist/build/mp-weixin/pageC/accountSecurity/accountSecurity.js
  70. 2 2
      unpackage/dist/build/mp-weixin/pageC/accountSecurity/component/textRight.js
  71. 1 1
      unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.js
  72. 0 1
      unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.js
  73. 0 0
      unpackage/dist/build/mp-weixin/pageC/addEditAddress/component/selectCity.js
  74. 0 1
      unpackage/dist/build/mp-weixin/pageC/addressManagement/addressManagement.js
  75. 2 2
      unpackage/dist/build/mp-weixin/pageC/addressManagement/component/address.js
  76. 0 1
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.js
  77. 0 1
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.wxml
  78. 0 1
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.wxss
  79. 2 2
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/component/reasonPopup.js
  80. 0 0
      unpackage/dist/build/mp-weixin/pageC/balanceDetail/balanceDetail.js
  81. 1 1
      unpackage/dist/build/mp-weixin/pageC/editName/editName.js
  82. 1 1
      unpackage/dist/build/mp-weixin/pageC/ensureExplain/ensureExplain.js
  83. 0 0
      unpackage/dist/build/mp-weixin/pageC/ensureMoney/ensureMoney.js
  84. 1 1
      unpackage/dist/build/mp-weixin/pageC/index.js
  85. 0 0
      unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.js
  86. 2 2
      unpackage/dist/build/mp-weixin/pageC/mineComponent/agreePopup.js
  87. 2 2
      unpackage/dist/build/mp-weixin/pageC/mineComponent/allRight/allRight.js
  88. 2 2
      unpackage/dist/build/mp-weixin/pageC/mineComponent/moneyDetail/index.js
  89. 0 0
      unpackage/dist/build/mp-weixin/pageC/mineFollow/mineFollow.js
  90. 0 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js
  91. 0 1
      unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.js
  92. 2 2
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.js
  93. 1 5
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.js
  94. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/orderForm.js
  95. 0 1
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/component/commodityDetail.js
  96. 0 1
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/component/commodityDetail.wxml
  97. 0 1
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/component/commodityDetail.wxss
  98. 0 1
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.js
  99. 0 1
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxml
  100. 0 1
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxss

+ 1 - 1
manifest.json

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

+ 1 - 1
pageA/chat/chat.vue

@@ -14,7 +14,7 @@
 		</u-navbar>
 
 
-		<view class="" style="height: 200rpx;"></view>
+		<view class="" style="height: 60rpx;"></view>
 
 		<view class="chat-item" v-for="(item,index) in list" :key="index">
 			<view class="chat-time">

+ 1 - 1
pageA/chat/news.vue

@@ -34,7 +34,7 @@
 						<view class="">
 							<view class=""> -->
 				<view class="u-flex " v-if="item.conversationId != '13523652365'">
-					<image :src=" item.lastMessage.ext.user_other.avatar" style="width: 88rpx;height: 88rpx;" mode="">
+					<image :src="item.lastMessage.ext.user_other.avatar" style="width: 88rpx;height: 88rpx;" mode="">
 					</image>
 					<view class="u-row-between"
 						style="display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">

+ 1 - 1
pageA/service/service.vue

@@ -8,7 +8,7 @@
 			</view>
 		</u-navbar>
 
-		<view class="" style="height: 100rpx;"></view>
+		<view class="" style="height: 60rpx;"></view>
 
 		<view class="chat-item" v-for="(item,index) in list" :key="index">
 			<view class="chat-time">

+ 229 - 226
pageC/refundDetail/component/refundInformation.vue

@@ -1,259 +1,262 @@
 <template>
-  <view class="detail">
-    <view class="title">
-      <view class="title-left">
-        <image
-          class="header-img"
-          :src="goodsDetail.merchant.image"
-          mode=""
-        ></image>
-        <text>{{ goodsDetail.merchant.merchant_name }}</text>
-        <image
-          class="right-325"
-          src="../../../static/mine/325.png"
-          mode=""
-        ></image>
-      </view>
-      <view class="title-right">
-        <u-icon name="chat" color="#f83224" size="28"></u-icon>
-        <text>联系{{ goodsDetail.merchant.id == 1 ? "平台" : "团长" }}</text>
-      </view>
-    </view>
-    <view class="commodity-information">
-      <view class="commodity-1">
-        <image
-          class="commodity-img"
-          :src="goodsDetail.goods_image"
-          mode=""
-        ></image>
-        <view class="">
-          <view class="commodity-2">
-            <view class="commodity-title">{{ goodsDetail.goods_name }} </view>
-          </view>
+	<view class="detail">
+		<view class="title">
+			<view class="title-left">
+				<image class="header-img" :src="goodsDetail.merchant.image" mode=""></image>
+				<text>{{ goodsDetail.merchant.merchant_name }}</text>
+				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+			</view>
+			<view class="title-right" @click="tochat">
+				<u-icon name="chat" color="#f83224" size="28"></u-icon>
+				<text>联系{{ goodsDetail.merchant.id == 1 ? "平台" : "团长" }}</text>
+			</view>
+		</view>
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img" :src="goodsDetail.goods_image" mode=""></image>
+				<view class="">
+					<view class="commodity-2">
+						<view class="commodity-title">{{ goodsDetail.goods_name }} </view>
+					</view>
 
-          <view class="commodity-3">
-            <view class="specifications">
-              {{ goodsDetail.sku_item.item }}
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="information">
-      <text class="_label">订单编号</text>
-      <view style="color: #222">
-        <text style="color: rgba(34, 34, 34, 0.6)">{{
+					<view class="commodity-3">
+						<view class="specifications">
+							{{ goodsDetail.sku_item.item }}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">订单编号</text>
+			<view style="color: #222">
+				<text style="color: rgba(34, 34, 34, 0.6)">{{
           goodsDetail.order_no
         }}</text>
-        <text @click="cope(goodsDetail.order_no)" style="color: #f83224">{{
+				<text @click="cope(goodsDetail.order_no)" style="color: #f83224">{{
           "&nbsp;" + "|" + "&nbsp;" + "复制"
         }}</text>
-      </view>
-    </view>
-    <view class="information">
-      <text class="_label">退款原因</text>
-      <view class="_title-right"> {{ goodsDetail.refund.refund_reason }} </view>
-    </view>
-    <view class="information">
-      <text class="_label">退款金额</text>
-      <view class="_title-right"> ¥{{ goodsDetail.amount }} </view>
-    </view>
-    <view class="information">
-      <text class="_label">申请件数</text>
-      <view class="_title-right">1 </view>
-    </view>
-    <view class="information">
-      <text class="_label">申请时间</text>
-      <view class="_title-right">{{ goodsDetail.refund.created_at }}</view>
-    </view>
-  </view>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">退款原因</text>
+			<view class="_title-right"> {{ goodsDetail.refund.refund_reason }} </view>
+		</view>
+		<view class="information">
+			<text class="_label">退款金额</text>
+			<view class="_title-right"> ¥{{ goodsDetail.amount }} </view>
+		</view>
+		<view class="information">
+			<text class="_label">申请件数</text>
+			<view class="_title-right">1 </view>
+		</view>
+		<view class="information">
+			<text class="_label">申请时间</text>
+			<view class="_title-right">{{ goodsDetail.refund.created_at }}</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import textRight from "../../accountSecurity/component/textRight.vue";
-export default {
-  components: {
-    textRight,
-  },
-  props: {
-    status: {
-      typeof: Number,
-      default: 0,
-    },
-    goodsDetail: {
-      typeof: Object,
-      default: () => {
-        return {};
-      },
-    },
-  },
-  data() {
-    return {
-      packageId: "",
-    };
-  },
-  onLoad(options) {},
-  methods: {
-    application() {
-      uni.navigateTo({
-        url: "/pageC/applicationRefund/applicationRefund",
-      });
-    },
+	import textRight from "../../accountSecurity/component/textRight.vue";
+	export default {
+		components: {
+			textRight,
+		},
+		props: {
+			status: {
+				typeof: Number,
+				default: 0,
+			},
+			goodsDetail: {
+				typeof: Object,
+				default: () => {
+					return {};
+				},
+			},
+		},
+		data() {
+			return {  
+				packageId: "",
+			};
+		},
+		onLoad(options) {},
+		methods: {
+			tochat() {
+				var that = this
+				if (that.goodsDetail.merchant.id == 1) {
+					uni.navigateTo({
+						url: '/pageA/service/service'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pageA/chat/chat?user_other=' + encodeURIComponent(JSON.stringify(
+								that.goodsDetail
+								.merchant)) + '&user_other_no=' + that.goodsDetail.merchant.member
+							.easemob_username
+					})
+				}
+			},
+			application() {
+				uni.navigateTo({
+					url: "/pageC/applicationRefund/applicationRefund",
+				});
+			},
 
-    //复制
-    cope(e) {
-      uni.setClipboardData({
-        data: e,
-        success() {
-          uni.showToast({
-            title: "复制成功",
-            icon: "none",
-          });
-        },
-      });
-    },
-    getDetail() {},
-  },
-};
+			//复制
+			cope(e) {
+				uni.setClipboardData({
+					data: e,
+					success() {
+						uni.showToast({
+							title: "复制成功",
+							icon: "none",
+						});
+					},
+				});
+			},
+			getDetail() {},
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-.detail {
-  padding: 28rpx 20rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  margin-top: 28rpx;
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
 
-  .title {
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-    padding-bottom: 20rpx;
+		.title {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+			padding-bottom: 20rpx;
 
-    .title-left {
-      display: flex;
-      font-size: 32rpx;
-      align-items: center;
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
 
-      .header-img {
-        width: 36rpx;
-        height: 36rpx;
-        border-radius: 50%;
-        margin-right: 20rpx;
-      }
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
 
-      .right-325 {
-        width: 32rpx;
-        height: 32rpx;
-      }
-    }
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
 
-    .title-right {
-      color: #333;
-      display: flex;
-      align-items: center;
-      font-size: 28rpx;
-    }
+			.title-right {
+				color: #333;
+				display: flex;
+				align-items: center;
+				font-size: 28rpx;
+			}
 
-    .order-status {
-      color: #f83224;
-      font-size: 26rpx;
-    }
-  }
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
 
-  .commodity-information {
-    margin-top: 28rpx;
+		.commodity-information {
+			margin-top: 28rpx;
 
-    .commodity-1 {
-      display: flex;
+			.commodity-1 {
+				display: flex;
 
-      .commodity-img {
-        width: 180rpx;
-        height: 180rpx;
-        margin-right: 20rpx;
-        border-radius: 10rpx;
-      }
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
 
-      .commodity-2 {
-        display: flex;
-        justify-content: space-between;
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
 
-        .commodity-title {
-          color: #222;
-          margin-right: 38rpx;
-          font-size: 28rpx;
-          width: 442rpx;
-          max-height: 80rpx;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-      }
+					.commodity-title {
+						color: #222;
+						margin-right: 38rpx;
+						font-size: 28rpx;
+						width: 442rpx;
+						max-height: 80rpx;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
 
-      .commodity-3 {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 20rpx;
-        color: #777;
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
 
-        .specifications {
-          font-size: 28rpx;
-          color: #777;
-        }
-      }
-    }
-  }
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+			}
+		}
 
-  .last {
-    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-    padding-bottom: 20rpx;
-  }
+		.last {
+			border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+			padding-bottom: 20rpx;
+		}
 
-  .btn-list {
-    display: flex;
-    justify-content: flex-end;
+		.btn-list {
+			display: flex;
+			justify-content: flex-end;
 
-    button {
-      width: 152rpx;
-      height: 58rpx;
-      border: 2rpx solid #979797;
-      color: #444;
-      margin: 0;
-      padding: 0;
-      font-size: 24rpx;
-      background-color: #fff;
-      border-radius: 34rpx;
-      margin-top: 20rpx;
-      margin-left: 20rpx;
-    }
-  }
+			button {
+				width: 152rpx;
+				height: 58rpx;
+				border: 2rpx solid #979797;
+				color: #444;
+				margin: 0;
+				padding: 0;
+				font-size: 24rpx;
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin-top: 20rpx;
+				margin-left: 20rpx;
+			}
+		}
 
-  .information {
-    display: flex;
-    justify-content: space-between;
-    font-size: 28rpx;
-    align-items: flex-end;
-    margin: 34rpx 0;
+		.information {
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin: 34rpx 0;
 
-    ._label {
-      font-size: 28rpx;
-      color: #333;
-    }
+			._label {
+				font-size: 28rpx;
+				color: #333;
+			}
 
-    ._title-right {
-      font-size: 28rpx;
-      color: rgba(34, 34, 34, 0.6);
-    }
-  }
+			._title-right {
+				font-size: 28rpx;
+				color: rgba(34, 34, 34, 0.6);
+			}
+		}
 
-  ._bottom {
-    display: flex;
-    justify-content: flex-end;
-    font-size: 28rpx;
-    align-items: flex-end;
-    margin-top: 34rpx;
-  }
-}
-</style>
+		._bottom {
+			display: flex;
+			justify-content: flex-end;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin-top: 34rpx;
+		}
+	}
+</style>

+ 30 - 11
pages/express/express.vue

@@ -8,9 +8,12 @@
 			</image>
 			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :safeAreaInsetTop="true">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
-					<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode=""
-						style="width: 40rpx;height: 40rpx;">
-					</image>
+					<view class="" style="width: 40rpx;height:40rpx;position: relative;">
+						<u-badge :absolute='true' :offset="[0,-8]" :type="type" max="99" :value="unReadCount"></u-badge>
+						<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode=""
+							style="width: 40rpx;height: 40rpx;">
+						</image>
+					</view>
 					<image @click="counter" src="../../static/images/index/compile.png" mode=""
 						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
 					<image src="../../static/images/index/dianhua.png" mode=""
@@ -58,8 +61,7 @@
 						</image>
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
-						<view v-if="JSON.stringify(bottomadd)=='{}'" class="u-row-between " style=""
-							@click="recipirnt">
+						<view v-if="JSON.stringify(bottomadd)=='{}'" class="u-row-between " style="" @click="recipirnt">
 							<view class="pople">{{i18n.recipient}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
@@ -234,8 +236,8 @@
 		</view>
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
-				<kj-flow :language="language" :goodstype="goodinfo.goodtype" ref="child" :province_id='province_id' @success='success'
-					@close='close()' :leftchangea='leftchange' :rightchangea='rightchange'
+				<kj-flow :language="language" :goodstype="goodinfo.goodtype" ref="child" :province_id='province_id'
+					@success='success' @close='close()' :leftchangea='leftchange' :rightchangea='rightchange'
 					:typeida='typeid'></kj-flow>
 			</view>
 		</u-popup>
@@ -246,6 +248,9 @@
 </template>
 
 <script>
+	import {
+		conn,
+	} from '@/utils/WebIM';
 	export default {
 		data() {
 			return {
@@ -272,6 +277,7 @@
 				leftchange: '',
 				rightchange: '',
 				typeid: '',
+				unReadCount: 0
 			}
 		},
 		onLoad(options) {
@@ -279,7 +285,7 @@
 			if (options.current) {
 				this.current = options.current
 			}
-			
+
 		},
 		onShow() {
 			this.list[0] = this.i18n.border
@@ -292,6 +298,7 @@
 				this.language = uni.getStorageSync('language')
 			}
 			this.getexpress()
+			this.getlist()
 		},
 		computed: {
 			i18n() {
@@ -299,6 +306,18 @@
 			}
 		},
 		methods: {
+			getlist() {
+				this.unReadCount = 0
+				conn.getServerConversations({
+					pageSize: 50,
+					cursor: ''
+				}).then((res) => {
+					console.log(res);
+					res.data.conversations.forEach((item) => {
+						this.unReadCount += item.unReadCount
+					})
+				})
+			},
 			onShareAppMessage(res) {
 				if (res.from === 'button') { // 来自页面内分享按钮
 					console.log(res.target)
@@ -386,8 +405,8 @@
 				if (this.province_id) {
 					this.logshow = true
 					setTimeout(() => {
-						console.log('2222222',this.$refs.child);
-						that.$refs.child.transport();   
+						console.log('2222222', this.$refs.child);
+						that.$refs.child.transport();
 					}, 800)
 				} else {
 					this.$u.toast('请先选择城市')
@@ -492,7 +511,7 @@
 						url: '/pageB/goods',
 						events: {
 							goodinfo: function(res) {
-								console.log('goodinfo',res);
+								console.log('goodinfo', res);
 								that.goodinfo = res
 							}
 						}

+ 47 - 8
pages/index/index.vue

@@ -8,9 +8,12 @@
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;" mode=""></image>
 			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :fixed='true'>
 				<view class="u-nav-slot" slot="left" style="display: flex;">
-					<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode=""
-						style="width: 40rpx;height: 40rpx;">
-					</image>
+					<view class="" style="width: 40rpx;height:40rpx;position: relative;">
+						<u-badge :absolute='true' :offset="[0,-8]" :type="type" max="99" :value="unReadCount"></u-badge>
+						<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode=""
+							style="width: 40rpx;height: 40rpx;">
+						</image>
+					</view>
 					<image @click="counter" src="../../static/images/index/compile.png" mode=""
 						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
 					<image src="../../static/images/index/dianhua.png" mode=""
@@ -174,7 +177,8 @@
 							¥{{item.weight}}/kg
 						</text>
 					</view>
-					<view v-if="item.label_arr" class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 6px;overflow: hidden;">
+					<view v-if="item.label_arr" class="u-flex"
+						style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 6px;overflow: hidden;">
 						<!-- 					<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
 							style="border: 1rpx solid #E5BC78;color: #E5BC78;">
 							<text>{{child.name_cn}}</text>
@@ -216,6 +220,9 @@
 
 <script>
 	import {
+		conn,
+	} from '@/utils/WebIM';
+	import {
 		recom
 	} from "../../network/shopApi.js";
 	export default {
@@ -247,7 +254,9 @@
 				parent_id: '',
 				last_page: '',
 				configimage: '',
-				url: ''
+				url: '',
+				unReadCount: 0,
+				type: "error",
 			}
 		},
 		computed: {
@@ -271,14 +280,13 @@
 			}
 		},
 		onLoad(options) {
-
 			// this.seater()
 			if (options.current) {
 				this.current = options.current
 			}
 			//商品推荐
-
-
+			this.HXlogin()
+			
 		},
 		onShow() {
 			this.config()
@@ -294,8 +302,39 @@
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')
 			}
+			
 		},
 		methods: {
+			HXlogin() {
+				if (uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
+					var user_no = uni.getStorageSync('user_no')
+					var pwd = uni.getStorageSync('pwd')
+					conn.open({
+						user: user_no,
+						pwd: pwd,
+						appKey: conn.appkey
+					}).then(() => {
+						console.log('res');
+						this.getlist()
+					}).catch(reason => {
+						console.log('失败', reason);
+					})
+			
+				}
+			},
+			getlist() {
+				this.unReadCount = 0
+				conn.getServerConversations({
+					pageSize: 50,
+					cursor: ''
+				}).then((res) => {
+					console.log(res);
+					res.data.conversations.forEach((item) => {
+						this.unReadCount += item.unReadCount
+					})
+					console.log(this.unReadCount);
+				})
+			},
 			callphone() {
 				uni.$u.http.get('/api/config', {
 					params: {

+ 113 - 151
pages/mine/component/teamFunction.vue

@@ -1,159 +1,121 @@
 <template>
-  <!-- 团长功能 -->
-  <view class="team">
-    <text class="team-title">{{ i18n.leaderunction }}</text>
-    <view class="function-team">
-      <view
-        class="icon-center"
-        @click="toNextPage('/pageD/platformProducts/platformProducts')"
-      >
-        <image
-          class="form-icon"
-          src="../../../static/mine/319.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.platform }}</view>
-      </view>
-      <view
-        class="icon-center"
-        @click="toNextPage('/pageD/commodityManage/commodityManage')"
-      >
-        <image
-          class="form-icon"
-          src="../../../static/mine/318.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.productManagement }}</view>
-      </view>
-      <view
-        class="icon-center"
-        @click="toNextPage('/pageD/orderFormManage/orderFormManage')"
-      >
-        <image
-          class="form-icon"
-          src="../../../static/mine/315.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.orderManagement }}</view>
-      </view>
-      <view
-        class="icon-center"
-        @click="toNextPage('/pageD/afterSalesManage/afterSalesManage')"
-      >
-        <image
-          class="form-icon"
-          src="../../../static/mine/320.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.afterSales }}</view>
-      </view>
-      <view
-        class="icon-center"
-        @click="toNextPage('/pageD/supplyChainGoods/supplyChainGoods')"
-      >
-        <image
-          class="form-icon"
-          src="../../../static/mine/316.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.supplyChain }}</view>
-      </view>
-      <view
-        class="icon-center"
-        @click="toNextPage('/pageD/resultFeedback/resultFeedback')"
-      >
-        <image
-          class="form-icon"
-          style="padding: 0 15px"
-          src="../../../static/mine/pc.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.PCEnd }}</view>
-      </view>
-      <view class="icon-center">
-        <image
-          class="form-icon"
-          src="../../../static/mine/317.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.pontact }}</view>
-      </view>
-      <view
-        class="icon-center"
-        @click="toNextPage('/pageC/accountSetup/accountSetup')"
-      >
-        <image
-          class="form-icon"
-          src="../../../static/mine/321.png"
-          mode=""
-        ></image>
-        <view class="characters">{{ i18n.accountSettings }}</view>
-      </view>
-    </view>
-  </view>
+	<!-- 团长功能 -->
+	<view class="team">
+		<text class="team-title">{{ i18n.leaderunction }}</text>
+		<view class="function-team">
+			<view class="icon-center" @click="toNextPage('/pageD/platformProducts/platformProducts')">
+				<image class="form-icon" src="../../../static/mine/319.png" mode=""></image>
+				<view class="characters">{{ i18n.platform }}</view>
+			</view>
+			<view class="icon-center" @click="toNextPage('/pageD/commodityManage/commodityManage')">
+				<image class="form-icon" src="../../../static/mine/318.png" mode=""></image>
+				<view class="characters">{{ i18n.productManagement }}</view>
+			</view>
+			<view class="icon-center" @click="toNextPage('/pageD/orderFormManage/orderFormManage')">
+				<image class="form-icon" src="../../../static/mine/315.png" mode=""></image>
+				<view class="characters">{{ i18n.orderManagement }}</view>
+			</view>
+			<view class="icon-center" @click="toNextPage('/pageD/afterSalesManage/afterSalesManage')">
+				<image class="form-icon" src="../../../static/mine/320.png" mode=""></image>
+				<view class="characters">{{ i18n.afterSales }}</view>
+			</view>
+			<view class="icon-center" @click="toNextPage('/pageD/supplyChainGoods/supplyChainGoods')">
+				<image class="form-icon" src="../../../static/mine/316.png" mode=""></image>
+				<view class="characters">{{ i18n.supplyChain }}</view>
+			</view>
+			<view class="icon-center" @click="toNextPage('/pageD/resultFeedback/resultFeedback')">
+				<image class="form-icon" style="padding: 0 15px" src="../../../static/mine/pc.png" mode=""></image>
+				<view class="characters">{{ i18n.PCEnd }}</view>
+			</view>
+			<view class="icon-center" v-if="user_no !='13523652365'" @click="tokefu">
+				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
+				<view class="characters">{{ i18n.pontact }}</view>
+			</view>
+			<view class="icon-center" @click="toNextPage('/pageC/accountSetup/accountSetup')">
+				<image class="form-icon" src="../../../static/mine/321.png" mode=""></image>
+				<view class="characters">{{ i18n.accountSettings }}</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {};
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  methods: {
-    toNextPage(url) {
-      uni.navigateTo({
-        url: url,
-      });
-    },
-  },
-};
+	export default {
+		data() {
+			return {
+				user_no: ''
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		created() {   
+			if (uni.getStorageSync('user_no')) {
+				this.user_no = uni.getStorageSync('user_no')
+			}
+		},
+		methods: {
+			tokefu() {
+				uni.navigateTo({
+					url: '/pageA/service/service'
+				})
+			},
+			toNextPage(url) {
+				uni.navigateTo({
+					url: url,
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-.team {
-  width: 100%;
-  background-color: #fff;
-  border-radius: 10px;
-  margin-top: 10px;
-  padding-top: 14px;
-  padding-bottom: 20px;
-  .team-title {
-    color: #222;
-    font-size: 14px;
-    font-weight: 600;
-    display: block;
-    margin-left: 10px;
-  }
-  .function-team {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-around;
-    align-items: center;
-    .icon-center {
-      width: 18%;
-      margin-top: 18px;
-      display: flex;
-      flex-wrap: wrap;
-      padding: 0 10px;
-      justify-content: center;
-      flex-direction: column;
-      align-items: center;
-    }
-    .form-icon {
-      width: 24px;
-      height: 24px;
-    }
+	.team {
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10px;
+		margin-top: 10px;
+		padding-top: 14px;
+		padding-bottom: 20px;
 
-    .characters {
-      color: #202020;
-      font-size: 12px;
-      text-align: center;
-      margin-top: 10px;
-    }
-  }
-}
-</style>
+		.team-title {
+			color: #222;
+			font-size: 14px;
+			font-weight: 600;
+			display: block;
+			margin-left: 10px;
+		}
+
+		.function-team {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-around;
+			align-items: center;
+
+			.icon-center {
+				width: 18%;
+				margin-top: 18px;
+				display: flex;
+				flex-wrap: wrap;
+				padding: 0 10px;
+				justify-content: center;
+				flex-direction: column;
+				align-items: center;
+			}
+
+			.form-icon {
+				width: 24px;
+				height: 24px;
+			}
+
+			.characters {
+				color: #202020;
+				font-size: 12px;
+				text-align: center;
+				margin-top: 10px;
+			}
+		}
+	}
+</style>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/common/runtime.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/common/vendor.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 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"],{"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"]]]);
+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"]]]);

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/changelange.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
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"],{"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"]]]);
+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"]]]);

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/counter.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 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"],{"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"]]]);
+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"]]]);

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/logisticsinfo.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/order.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/order.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/order.wxss


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/payorder.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/payorder.wxml


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

@@ -1,5 +1 @@
-<<<<<<< HEAD
-.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}
-=======
-.payment.data-v-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-07bdf112{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-07bdf112{position:relative}.back .topbox .state.data-v-07bdf112{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-07bdf112{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-07bdf112{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
->>>>>>> a3ea1f0745e55ee4b5b28fdb7055a5e9f8f0faf3
+.payment.data-v-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-07bdf112{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-07bdf112{position:relative}.back .topbox .state.data-v-07bdf112{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-07bdf112{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-07bdf112{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/productdetails.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/productdetails.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/rule/rule.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/shoplist.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/shoplist.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/shoptype.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/subsidy.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/subsidy.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 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>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/account.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 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"],{"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"]]]);
+(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"]]]);

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/delivery.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/delivery.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/expresstype.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/goods.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 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"],{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"]]]);
+(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"]]]);

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/list/list.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/myPackage.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 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"],{"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"]]]);
+(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"]]]);

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

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

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/search.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageB/search.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 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"],{"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"]]]);
+(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"]]]);

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

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

+ 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"],{"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"],{"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-create-component',
     {
         'pageC/accountSecurity/component/textRight-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("b162"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("ac58"))
         })
     },
     [['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"],{"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"]]]);
+(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"]]]);

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/addEditAddress/addEditAddress.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/addEditAddress/component/selectCity.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
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"],{"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"],{"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-create-component',
     {
         'pageC/addressManagement/component/address-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("884b"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("129f"))
         })
     },
     [['pageC/addressManagement/component/address-create-component']]

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
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"],{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"],{"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-create-component',
     {
         'pageC/applicationRefund/component/reasonPopup-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("8006"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("07f8"))
         })
     },
     [['pageC/applicationRefund/component/reasonPopup-create-component']]

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/balanceDetail/balanceDetail.js


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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/editName/editName"],{"29a9":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{name:"张三"}},onLoad:function(n){this.name=n.name},computed:{i18n:function(){return this.$t("index")}},mounted:function(){n.setNavigationBarTitle({title:this.i18n.editNextname})},methods:{changename:function(){var t=this.getOpenerEventChannel();t.emit("getname",this.name),n.navigateBack()}}};t.default=e}).call(this,e("df3c")["default"])},3802:function(n,t,e){"use strict";e.r(t);var a=e("709d"),i=e("cfa0");for(var u in i)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(u);e("78b5");var c=e("828b"),o=Object(c["a"])(i["default"],a["b"],a["c"],!1,null,"6c486249",null,!1,a["a"],void 0);t["default"]=o.exports},"39bf":function(n,t,e){"use strict";(function(n,t){var a=e("47a9");e("abeb");a(e("3240"));var i=a(e("3802"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(i.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},"709d":function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){return a}));var a={"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"7780"))}},i=function(){var n=this.$createElement,t=(this._self._c,this.name.length);this.$mp.data=Object.assign({},{$root:{g0:t}})},u=[]},"78b5":function(n,t,e){"use strict";var a=e("7bbf"),i=e.n(a);i.a},"7bbf":function(n,t,e){},cfa0:function(n,t,e){"use strict";e.r(t);var a=e("29a9"),i=e.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);t["default"]=i.a}},[["39bf","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/editName/editName"],{"49f1":function(n,t,e){},6166:function(n,t,e){"use strict";var a=e("49f1"),u=e.n(a);u.a},"733d":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{name:"张三"}},onLoad:function(n){this.name=n.name},computed:{i18n:function(){return this.$t("index")}},mounted:function(){n.setNavigationBarTitle({title:this.i18n.editNextname})},methods:{changename:function(){var t=this.getOpenerEventChannel();t.emit("getname",this.name),n.navigateBack()}}};t.default=e}).call(this,e("543d")["default"])},"79d4":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return a}));var a={"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"bead"))}},u=function(){var n=this,t=n.$createElement,e=(n._self._c,n.name.length);n.$mp.data=Object.assign({},{$root:{g0:e}})},i=[]},"9b00":function(n,t,e){"use strict";(function(n,t){var a=e("4ea4");e("f93b");a(e("66fd"));var u=a(e("b3bd"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},b3bd:function(n,t,e){"use strict";e.r(t);var a=e("79d4"),u=e("f7eb");for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);e("6166");var c,o=e("f0c5"),r=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,"6c486249",null,!1,a["a"],c);t["default"]=r.exports},f7eb:function(n,t,e){"use strict";e.r(t);var a=e("733d"),u=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(i);t["default"]=u.a}},[["9b00","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/ensureExplain/ensureExplain"],{"0b8d":function(e,n,t){},"22a6":function(e,n,t){"use strict";t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"aca6"))}},a=function(){var e=this.$createElement;this._self._c},r=[]},"8eeb":function(e,n,t){"use strict";t.r(n);var u=t("fa53"),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},"93f1":function(e,n,t){"use strict";var u=t("0b8d"),a=t.n(u);a.a},"9ab3":function(e,n,t){"use strict";t.r(n);var u=t("22a6"),a=t("8eeb");for(var r in a)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(r);t("93f1");var o=t("828b"),c=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=c.exports},d58c:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("9ab3"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},fa53:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{agreementContent:""}},methods:{getAgreementContent:function(){var n=this;e.$u.http.get("/api/agreement?code=margin_rule").then((function(e){console.log(e),n.agreementContent=e}))}},mounted:function(){this.getAgreementContent()}};n.default=t}).call(this,t("df3c")["default"])}},[["d58c","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/ensureExplain/ensureExplain"],{"14a5":function(e,n,t){"use strict";var u=t("d339"),r=t.n(u);r.a},7538:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{agreementContent:""}},methods:{getAgreementContent:function(){var n=this;e.$u.http.get("/api/agreement?code=margin_rule").then((function(e){console.log(e),n.agreementContent=e}))}},mounted:function(){this.getAgreementContent()}};n.default=t}).call(this,t("543d")["default"])},b458:function(e,n,t){"use strict";t.r(n);var u=t("f4e5"),r=t("bc26");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);t("14a5");var o,c=t("f0c5"),i=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],o);n["default"]=i.exports},bc26:function(e,n,t){"use strict";t.r(n);var u=t("7538"),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},d339:function(e,n,t){},f263:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var r=u(t("b458"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},f4e5:function(e,n,t){"use strict";t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"0d5f"))}},r=function(){var e=this,n=e.$createElement;e._self._c},a=[]}},[["f263","common/runtime","common/vendor"]]]);

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/ensureMoney/ensureMoney.js


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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{"48bd":function(e,n,t){"use strict";t.r(n);var u=t("eae9"),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},"86af":function(e,n,t){"use strict";t.r(n);var u=t("c17c"),a=t("48bd");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);var r=t("828b"),f=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=f.exports},c17c: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=[]},eae9:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}},created:function(){}}},f268:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("86af"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["f268","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{"05b2":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var c=function(){var n=this,t=n.$createElement;n._self._c},r=[]},6188:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{}},created:function(){}};t.default=u},abcd:function(n,t,e){"use strict";e.r(t);var u=e("05b2"),c=e("f9cd");for(var r in c)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(r);var a,f=e("f0c5"),i=Object(f["a"])(c["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],a);t["default"]=i.exports},cbb2:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var c=u(e("abcd"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(c.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},f9cd:function(n,t,e){"use strict";e.r(t);var u=e("6188"),c=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"]=c.a}},[["cbb2","common/runtime","common/vendor"]]]);

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.js


+ 2 - 2
unpackage/dist/build/mp-weixin/pageC/mineComponent/agreePopup.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/agreePopup"],{2545:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return f})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f1b1"))}},o=function(){var n=this.$createElement;this._self._c},f=[]},5251:function(n,e,t){"use strict";t.r(e);var u=t("2545"),o=t("dff4");for(var f in o)["default"].indexOf(f)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(f);t("67ef");var r=t("828b"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"1ac27535",null,!1,u["a"],void 0);e["default"]=a.exports},"67ef":function(n,e,t){"use strict";var u=t("7fa0"),o=t.n(u);o.a},"7fa0":function(n,e,t){},c2e4:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{}}};e.default=u},dff4:function(n,e,t){"use strict";t.r(e);var u=t("c2e4"),o=t.n(u);for(var f in u)["default"].indexOf(f)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(f);e["default"]=o.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/agreePopup"],{"4ff4":function(n,e,t){"use strict";t.r(e);var u=t("a728"),o=t("cd67");for(var a in o)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(a);t("d9a6");var r,f=t("f0c5"),c=Object(f["a"])(o["default"],u["b"],u["c"],!1,null,"1ac27535",null,!1,u["a"],r);e["default"]=c.exports},a728:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))}},o=function(){var n=this,e=n.$createElement;n._self._c},a=[]},b454:function(n,e,t){},cd67:function(n,e,t){"use strict";t.r(e);var u=t("f1ba"),o=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);e["default"]=o.a},d9a6:function(n,e,t){"use strict";var u=t("b454"),o=t.n(u);o.a},f1ba:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{}}};e.default=u}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/mineComponent/agreePopup-create-component',
     {
         'pageC/mineComponent/agreePopup-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("5251"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("4ff4"))
         })
     },
     [['pageC/mineComponent/agreePopup-create-component']]

+ 2 - 2
unpackage/dist/build/mp-weixin/pageC/mineComponent/allRight/allRight.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/allRight/allRight"],{"2c60":function(t,n,e){"use strict";e.r(n);var a=e("7d7c"),u=e("356b");for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);e("e6e5");var i=e("828b"),c=Object(i["a"])(u["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);n["default"]=c.exports},"356b":function(t,n,e){"use strict";e.r(n);var a=e("472b"),u=e.n(a);for(var r in a)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(r);n["default"]=u.a},"472b":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={props:{name:{type:String,default:"全部"},withdrawal:{type:Boolean,default:!1}},data:function(){return{}}};n.default=a},"7d7c":function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var a=function(){var t=this.$createElement;this._self._c},u=[]},ac32:function(t,n,e){},e6e5:function(t,n,e){"use strict";var a=e("ac32"),u=e.n(a);u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/allRight/allRight"],{3353:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={props:{name:{type:String,default:"全部"},withdrawal:{type:Boolean,default:!1}},data:function(){return{}}};t.default=a},"6d22":function(n,t,e){"use strict";var a=e("8d3d"),u=e.n(a);u.a},"8d3d":function(n,t,e){},"9a4f":function(n,t,e){"use strict";e.r(t);var a=e("3353"),u=e.n(a);for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);t["default"]=u.a},c602:function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return a}));var u=function(){var n=this,t=n.$createElement;n._self._c},r=[]},edae:function(n,t,e){"use strict";e.r(t);var a=e("c602"),u=e("9a4f");for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);e("6d22");var f,i=e("f0c5"),c=Object(i["a"])(u["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],f);t["default"]=c.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/mineComponent/allRight/allRight-create-component',
     {
         'pageC/mineComponent/allRight/allRight-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("2c60"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("edae"))
         })
     },
     [['pageC/mineComponent/allRight/allRight-create-component']]

+ 2 - 2
unpackage/dist/build/mp-weixin/pageC/mineComponent/moneyDetail/index.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/moneyDetail/index"],{"1b50":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=[]},"36db":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{itemInfo:{type:Object,default:{}},withBool:{type:Boolean,default:!1}}};t.default=u},"584a":function(n,t,e){"use strict";var u=e("b397"),a=e.n(u);a.a},"6a28":function(n,t,e){"use strict";e.r(t);var u=e("36db"),a=e.n(u);for(var o in u)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(o);t["default"]=a.a},b397:function(n,t,e){},fcf2:function(n,t,e){"use strict";e.r(t);var u=e("1b50"),a=e("6a28");for(var o in a)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(o);e("584a");var i=e("828b"),f=Object(i["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);t["default"]=f.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/moneyDetail/index"],{"415f":function(n,e,t){"use strict";t.r(e);var u=t("ecdc"),a=t("e797");for(var r in a)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(r);t("ab94");var c,o=t("f0c5"),f=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);e["default"]=f.exports},ab94:function(n,e,t){"use strict";var u=t("da8b"),a=t.n(u);a.a},d506:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{itemInfo:{type:Object,default:{}},withBool:{type:Boolean,default:!1}}};e.default=u},da8b:function(n,e,t){},e797:function(n,e,t){"use strict";t.r(e);var u=t("d506"),a=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=a.a},ecdc:function(n,e,t){"use strict";var u;t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var a=function(){var n=this,e=n.$createElement;n._self._c},r=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/mineComponent/moneyDetail/index-create-component',
     {
         'pageC/mineComponent/moneyDetail/index-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("fcf2"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("415f"))
         })
     },
     [['pageC/mineComponent/moneyDetail/index-create-component']]

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/mineFollow/mineFollow.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.js


+ 2 - 2
unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"1e6a":function(n,t,e){"use strict";e.r(t);var o=e("27e1"),r=e("76b2");for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);e("e68a7");var u=e("828b"),a=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,"79d48033",null,!1,o["a"],void 0);t["default"]=a.exports},2330:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o={components:{textRight:function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("b162"))}.bind(null,e)).catch(e.oe)}},props:{itemInfo:{typeof:Object,default:{}}},computed:{},data:function(){return{show:!1}},watch:{itemInfo:function(n){}},methods:{more:function(){this.show=!this.show}}};t.default=o},"27e1":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={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"f971"))}},r=function(){var n=this,t=n.$createElement,e=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,e){var o=n.__get_orig(t),r=t.goods.price.split("."),i=t.goods.price.split(".");return{$orig:o,g0:r,g1:i}})):null),o=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,r=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:r}})},i=[]},"76b2":function(n,t,e){"use strict";e.r(t);var o=e("2330"),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},bd82:function(n,t,e){},e68a7:function(n,t,e){"use strict";var o=e("bd82"),r=e.n(o);r.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"0896":function(n,t,o){"use strict";var e=o("5bd7"),r=o.n(e);r.a},"2c7c":function(n,t,o){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e=function(){o.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(o("ac58"))}.bind(null,o)).catch(o.oe)},r={components:{textRight:e},props:{itemInfo:{typeof:Object,default:{}}},computed:{},data:function(){return{show:!1}},watch:{itemInfo:function(n){}},methods:{more:function(){this.show=!this.show}}};t.default=r},"5bd7":function(n,t,o){},"9b65":function(n,t,o){"use strict";o.r(t);var e=o("2c7c"),r=o.n(e);for(var i in e)["default"].indexOf(i)<0&&function(n){o.d(t,n,(function(){return e[n]}))}(i);t["default"]=r.a},b4ed:function(n,t,o){"use strict";o.r(t);var e=o("fb94"),r=o("9b65");for(var i in r)["default"].indexOf(i)<0&&function(n){o.d(t,n,(function(){return r[n]}))}(i);o("0896");var u,c=o("f0c5"),a=Object(c["a"])(r["default"],e["b"],e["c"],!1,null,"79d48033",null,!1,e["a"],u);t["default"]=a.exports},fb94:function(n,t,o){"use strict";o.d(t,"b",(function(){return r})),o.d(t,"c",(function(){return i})),o.d(t,"a",(function(){return e}));var e={uTransition:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-transition/u-transition")]).then(o.bind(null,"c714"))}},r=function(){var n=this,t=n.$createElement,o=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,o){var e=n.__get_orig(t),r=t.goods.price.split("."),i=t.goods.price.split(".");return{$orig:e,g0:r,g1:i}})):null),e=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,r=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:o,g2:e,g3:r}})},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/orderInofrmation-create-component',
     {
         'pageC/orderForm/component/orderInofrmation-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("1e6a"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("b4ed"))
         })
     },
     [['pageC/orderForm/component/orderInofrmation-create-component']]

+ 1 - 5
unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.js

@@ -1,13 +1,9 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{1257:function(t,n,e){"use strict";var r=e("a49a"),a=e.n(r);a.a},"467d":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=r},a49a:function(t,n,e){},aed1:function(t,n,e){"use strict";e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var r=function(){var t=this,n=t.$createElement,e=(t._self._c,t.__map(t.itemInfo.order_goods,(function(n,e){var r=t.__get_orig(n),a=n.amount.split("."),u=n.amount.split(".");return{$orig:r,g0:a,g1:u}})));t.$mp.data=Object.assign({},{$root:{l0:e}})},a=[]},efd1:function(t,n,e){"use strict";e.r(n);var r=e("aed1"),a=e("f4f4");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("1257");var o=e("828b"),f=Object(o["a"])(a["default"],r["b"],r["c"],!1,null,"97f7bda6",null,!1,r["a"],void 0);n["default"]=f.exports},f4f4:function(t,n,e){"use strict";e.r(n);var r=e("467d"),a=e.n(r);for(var u in r)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(u);n["default"]=a.a}}]);
-=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"4ce8":function(t,n,e){"use strict";var r;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return r}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.__map(t.itemInfo.order_goods,(function(n,e){var r=t.__get_orig(n),u=n.amount.split("."),c=n.amount.split(".");return{$orig:r,g0:u,g1:c}})));t.$mp.data=Object.assign({},{$root:{l0:e}})},c=[]},"67f8":function(t,n,e){"use strict";e.r(n);var r=e("d77c"),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(c);n["default"]=u.a},c0c8:function(t,n,e){},d77c:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=r},e1ce:function(t,n,e){"use strict";e.r(n);var r=e("4ce8"),u=e("67f8");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("fc42");var o,f=e("f0c5"),a=Object(f["a"])(u["default"],r["b"],r["c"],!1,null,"97f7bda6",null,!1,r["a"],o);n["default"]=a.exports},fc42:function(t,n,e){"use strict";var r=e("c0c8"),u=e.n(r);u.a}}]);
->>>>>>> a3ea1f0745e55ee4b5b28fdb7055a5e9f8f0faf3
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/refundCard-create-component',
     {
         'pageC/orderForm/component/refundCard-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("efd1"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("e1ce"))
         })
     },
     [['pageC/orderForm/component/refundCard-create-component']]

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/orderForm.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/component/commodityDetail.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/component/commodityDetail.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/component/commodityDetail.wxss


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxss


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor