Merge branch 'master' of http://git.huaml.com/zhh/front-end

# Conflicts:
#	ghsApp/dist/build/mp-weixin/admin/home/order.js
#	ghsApp/dist/build/mp-weixin/admin/shop/add.js
#	ghsApp/dist/build/mp-weixin/admin/shop/add.wxml
#	ghsApp/dist/build/mp-weixin/admin/shop/add.wxss
#	ghsApp/dist/build/mp-weixin/admin/staff/add.js
#	ghsApp/dist/build/mp-weixin/admin/staff/add.wxml
#	ghsApp/dist/build/mp-weixin/admin/staff/add.wxss
#	ghsApp/dist/build/mp-weixin/admin/staff/list.js
#	ghsApp/dist/build/mp-weixin/admin/staff/list.wxml
#	ghsApp/dist/build/mp-weixin/admin/staff/list.wxss
#	ghsApp/dist/build/mp-weixin/pagesClient/member/detail.js
#	ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxml
#	ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxss
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.js
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.wxml
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.wxss
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/list.js
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/list.wxml
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/list.wxss
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/select.js
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/select.wxml
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.js
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/shop/list.js
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.js
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.wxml
#	ghsApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.wxss
#	hdApp/dist/build/mp-weixin/admin/billing/confirm.js
#	hdApp/dist/build/mp-weixin/admin/billing/confirm.wxml
#	hdApp/dist/build/mp-weixin/admin/billing/confirm.wxss
#	hdApp/dist/build/mp-weixin/admin/billing/result.js
#	hdApp/dist/build/mp-weixin/admin/billing/result.wxml
#	hdApp/dist/build/mp-weixin/admin/billing/result.wxss
#	hdApp/dist/build/mp-weixin/admin/home/apply.js
#	hdApp/dist/build/mp-weixin/admin/home/apply.wxml
#	hdApp/dist/build/mp-weixin/admin/home/apply.wxss
#	hdApp/dist/build/mp-weixin/admin/home/workbench.js
#	hdApp/dist/build/mp-weixin/admin/home/workbench.wxml
#	hdApp/dist/build/mp-weixin/admin/home/workbench.wxss
#	hdApp/dist/build/mp-weixin/admin/order/components/sel-mention.js
#	hdApp/dist/build/mp-weixin/admin/recharge/renew.js
#	hdApp/dist/build/mp-weixin/admin/recharge/renew.wxml
#	hdApp/dist/build/mp-weixin/admin/recharge/renew.wxss
#	hdApp/dist/build/mp-weixin/admin/shop/add.js
#	hdApp/dist/build/mp-weixin/admin/shop/add.wxml
#	hdApp/dist/build/mp-weixin/admin/shop/add.wxss
#	hdApp/dist/build/mp-weixin/admin/staff/add.js
#	hdApp/dist/build/mp-weixin/admin/staff/add.wxml
#	hdApp/dist/build/mp-weixin/admin/staff/add.wxss
#	hdApp/dist/build/mp-weixin/admin/staff/list.js
#	hdApp/dist/build/mp-weixin/admin/staff/list.wxml
#	hdApp/dist/build/mp-weixin/admin/staff/list.wxss
#	hdApp/dist/build/mp-weixin/common/vendor.js
#	hdApp/dist/build/mp-weixin/components/module/app-order-list.js
#	hdApp/dist/build/mp-weixin/components/module/app-order-list.wxml
#	hdApp/dist/build/mp-weixin/components/module/app-order-list.wxss
#	hdApp/dist/build/mp-weixin/components/none-hd.js
#	hdApp/dist/build/mp-weixin/components/none-hd.wxml
#	hdApp/dist/build/mp-weixin/components/none-hd.wxss
#	hdApp/dist/build/mp-weixin/pagesPurchase/gathering.js
#	hdApp/dist/build/mp-weixin/pagesPurchase/gathering.wxml
#	hdApp/dist/build/mp-weixin/pagesPurchase/gathering.wxss
#	hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.js
#	hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.wxml
#	hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.wxss
#	hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.js
#	hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxml
#	hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxss
#	hdApp/dist/build/mp-weixin/pagesPurchase/shopping.js
#	hdApp/dist/build/mp-weixin/pagesPurchase/shopping.wxml
#	hdApp/dist/build/mp-weixin/pagesPurchase/shopping.wxss
#	hdApp/dist/build/mp-weixin/pagesStatistics/pagesPublicity.js
#	hdApp/dist/build/mp-weixin/pagesStatistics/pagesPublicity.wxml
#	hdApp/dist/build/mp-weixin/pagesStatistics/pagesPublicity.wxss
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/list.js
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/list.wxml
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/list.wxss
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/select.js
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/select.wxml
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/select.wxss
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.js
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.wxml
#	hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.wxss
#	hdApp/dist/build/mp-weixin/pagesStorehouse/shop/list.js
#	hdApp/dist/build/mp-weixin/pagesStorehouse/shop/list.wxml
#	hdApp/dist/build/mp-weixin/pagesStorehouse/shop/list.wxss
#	hdApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.js
#	hdApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.wxml
#	hdApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.wxss

ghs/dist/shop/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.31cb2e5f.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.31cb2e5f.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.52815f56.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.52815f56.js"></script></body></html>

ghs/src/sass/shop/shop.vue

@@ -1,13 +1,8 @@
 <template>
     <div class="app-list-content">
         <x-crud class="liu-crud-wrap" @load="onLoad">
-            <!-- 收款二维码 -->
             <template #table-column-gatheringCode="{scope}">
-                <el-button type="text" @click="gotoPage(1,scope.row)">查看</el-button>
-            </template>
-            <!--会员申请码 -->
-            <template #table-column-applyCode="{scope}">
-                <el-button type="text" @click="gotoPage(2,scope.row)">查看</el-button>
+                <el-button type="text" @click="gotoPage(1,scope.row)"></el-button>
             </template>
         </x-crud>
     </div>
@@ -72,11 +67,6 @@
                                 prop: 'gatheringCode',
                                 label: '收款二维码',
                                 align: 'center',
-                            },
-                            {
-                                prop: 'applyCode',
-                                label: '会员申请码',
-                                align: 'center',
                             }
                         ],
                         // 操作列

ghs/src/views/member/list.vue

@@ -71,15 +71,6 @@
 				<span v-else></span>
 			</template>
 
-
-			<!-- 充值 -->
-			<template #slot-recharge="{scope}">
-				<el-button type="text" size="mini" @click="rechargeShowFn(scope.row)">充值</el-button>
-			</template>
-			<!-- 升级 -->
-			<template #slot-upgrade="{scope}">
-				<el-button type="text" size="mini" @click="upgradeShowFn(scope.row)">升级</el-button>
-			</template>
 		</x-crud>
 
 		<!-- 详情 -->
@@ -175,16 +166,10 @@ export default {
 						},
 						{
 							prop: 'buyNum',
-							label: '累计次数',
+							label: '消费次数',
 							align: 'center',
 							width: 120
 						},
-						{
-							prop: 'recharge',
-							label: '累计充值',
-							align: 'center',
-							width: 150
-						},
 						{
 							prop: 'growth',
 							label: '成长值',

ghsApp/dist/build/mp-weixin/admin/shop/add.wxss

@@ -1 +1,5 @@
-.app-content.data-v-502ea402{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-502ea402{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-502ea402{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-502ea402{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-502ea402{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-502ea402{height:240rpx}.confirm-btn.data-v-502ea402{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-502ea402{width:100%}
+<<<<<<< HEAD
+.app-content.data-v-502ea402{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-502ea402{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-502ea402{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-502ea402{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-502ea402{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-502ea402{height:240rpx}.confirm-btn.data-v-502ea402{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-502ea402{width:100%}
+=======
+.app-content.data-v-31f3413a{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-31f3413a{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-31f3413a{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-31f3413a{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-31f3413a{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-31f3413a{height:240rpx}.confirm-btn.data-v-31f3413a{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-31f3413a{width:100%}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

ghsApp/dist/build/mp-weixin/admin/staff/add.wxss

@@ -1 +1,5 @@
-.app-content.data-v-0f7987c6{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-0f7987c6{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-0f7987c6{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-0f7987c6{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-0f7987c6{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-0f7987c6{height:240rpx}.confirm-btn.data-v-0f7987c6{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-0f7987c6{width:100%}
+<<<<<<< HEAD
+.app-content.data-v-0f7987c6{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-0f7987c6{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-0f7987c6{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-0f7987c6{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-0f7987c6{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-0f7987c6{height:240rpx}.confirm-btn.data-v-0f7987c6{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-0f7987c6{width:100%}
+=======
+.app-content.data-v-6a654755{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-6a654755{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-6a654755{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-6a654755{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-6a654755{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-6a654755{height:240rpx}.confirm-btn.data-v-6a654755{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-6a654755{width:100%}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

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

ghsApp/dist/build/mp-weixin/components/app-img.json

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

ghsApp/dist/build/mp-weixin/components/app-result.json

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

ghsApp/dist/build/mp-weixin/components/kd_entrance.json

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

ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json

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

ghsApp/dist/build/mp-weixin/components/module/app-tag.json

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

ghsApp/dist/build/mp-weixin/components/module/app-vip.json

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

ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

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

ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json

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

ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxss

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .module-com.data-v-19ac7028{margin:0 30rpx 20rpx;padding:20rpx;background-color:#fff;border-radius:10rpx;position:relative;z-index:10}.user-info.data-v-19ac7028{padding:60rpx 20rpx 60rpx;position:relative;top:51rpx}.user-info .user-info_top.data-v-19ac7028{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100rpx}.user-info .user-info_top .user-info_lf.data-v-19ac7028{position:relative;padding-left:10rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1}.user-info .user-info_top .user-info_lf .avatar.data-v-19ac7028{position:absolute;left:10rpx;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.user-info .user-info_top .user-info_lf .dec-bx.data-v-19ac7028{padding-left:130rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-19ac7028:nth-child(1){color:#333;font-size:36rpx;margin-bottom:3rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-19ac7028:nth-child(2){color:#666;font-size:30rpx}.user-info .user-info_top .already-shop.data-v-19ac7028{color:#09bb07;font-size:30rpx;font-weight:400}.user-info .user-info_top .already-shop > .iconfont.data-v-19ac7028{padding-right:8rpx;font-size:32rpx}.invite-bt.data-v-19ac7028{color:#fff;font-size:26rpx;font-weight:400;width:140rpx;height:50rpx;line-height:50rpx;background-color:#3385ff;text-align:center;border-radius:25rpx;border:1rpx solid #ddd;padding:0;-webkit-user-select:none;user-select:none;outline:none}.invite-bt.white.data-v-19ac7028{background-color:#fff;color:#666}.total-wrap .total-tit.data-v-19ac7028,
 .order-wrap .total-tit.data-v-19ac7028{padding:18rpx 0 18rpx 20rpx;border-bottom:1rpx solid #eee;font-weight:600;font-size:24rpx;color:#333}.total-wrap .total-blo.data-v-19ac7028,
 .order-wrap .total-blo.data-v-19ac7028{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:30rpx 0 0rpx}.total-wrap .total-blo .total-list.data-v-19ac7028,
@@ -6,4 +7,15 @@
 .order-wrap .total-blo .total-list .list-num.data-v-19ac7028{margin-top:8rpx;margin-bottom:8rpx;font-size:36rpx;font-weight:700}.total-wrap .total-blo .total-list .list-num.color-blue.data-v-19ac7028,
 .order-wrap .total-blo .total-list .list-num.color-blue.data-v-19ac7028{color:#3385ff}.total-wrap .total-blo .total-list.data-v-19ac7028:nth-child(3n),
 .order-wrap .total-blo .total-list.data-v-19ac7028:nth-child(3n){border-right:none}.total-wrap .total-blo .total-list.data-v-19ac7028:nth-child(n + 4),
-.order-wrap .total-blo .total-list.data-v-19ac7028:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-19ac7028{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-19ac7028{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-19ac7028{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-19ac7028:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-19ac7028:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-19ac7028{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-19ac7028:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-19ac7028:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-19ac7028{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-19ac7028{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-19ac7028{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-19ac7028{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}
+.order-wrap .total-blo .total-list.data-v-19ac7028:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-19ac7028{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-19ac7028{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-19ac7028{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-19ac7028:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-19ac7028:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-19ac7028{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-19ac7028:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-19ac7028:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-19ac7028{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-19ac7028{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-19ac7028{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-19ac7028{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}
+=======
+.module-com.data-v-d98bfd66{margin:0 30rpx 20rpx;padding:20rpx;background-color:#fff;border-radius:10rpx;position:relative;z-index:10}.user-info.data-v-d98bfd66{padding:60rpx 20rpx 60rpx;position:relative;top:51rpx}.user-info .user-info_top.data-v-d98bfd66{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100rpx}.user-info .user-info_top .user-info_lf.data-v-d98bfd66{position:relative;padding-left:10rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1}.user-info .user-info_top .user-info_lf .avatar.data-v-d98bfd66{position:absolute;left:10rpx;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.user-info .user-info_top .user-info_lf .dec-bx.data-v-d98bfd66{padding-left:130rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-d98bfd66:nth-child(1){color:#333;font-size:36rpx;margin-bottom:3rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-d98bfd66:nth-child(2){color:#666;font-size:30rpx}.user-info .user-info_top .already-shop.data-v-d98bfd66{color:#09bb07;font-size:30rpx;font-weight:400}.user-info .user-info_top .already-shop > .iconfont.data-v-d98bfd66{padding-right:8rpx;font-size:32rpx}.invite-bt.data-v-d98bfd66{color:#fff;font-size:26rpx;font-weight:400;width:140rpx;height:50rpx;line-height:50rpx;background-color:#3385ff;text-align:center;border-radius:25rpx;border:1rpx solid #ddd;padding:0;-webkit-user-select:none;user-select:none;outline:none}.invite-bt.white.data-v-d98bfd66{background-color:#fff;color:#666}.total-wrap .total-tit.data-v-d98bfd66,
+.order-wrap .total-tit.data-v-d98bfd66{padding:18rpx 0 18rpx 20rpx;border-bottom:1rpx solid #eee;font-weight:600;font-size:24rpx;color:#333}.total-wrap .total-blo.data-v-d98bfd66,
+.order-wrap .total-blo.data-v-d98bfd66{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:30rpx 0 0rpx}.total-wrap .total-blo .total-list.data-v-d98bfd66,
+.order-wrap .total-blo .total-list.data-v-d98bfd66{width:33%;text-align:center;margin:20rpx 0rpx;border-right:1rpx solid #eee}.total-wrap .total-blo .total-list .app-color-3.data-v-d98bfd66,
+.order-wrap .total-blo .total-list .app-color-3.data-v-d98bfd66{font-size:24rpx}.total-wrap .total-blo .total-list .list-num.data-v-d98bfd66,
+.order-wrap .total-blo .total-list .list-num.data-v-d98bfd66{margin-top:8rpx;margin-bottom:8rpx;font-size:36rpx;font-weight:700}.total-wrap .total-blo .total-list .list-num.color-blue.data-v-d98bfd66,
+.order-wrap .total-blo .total-list .list-num.color-blue.data-v-d98bfd66{color:#3385ff}.total-wrap .total-blo .total-list.data-v-d98bfd66:nth-child(3n),
+.order-wrap .total-blo .total-list.data-v-d98bfd66:nth-child(3n){border-right:none}.total-wrap .total-blo .total-list.data-v-d98bfd66:nth-child(n + 4),
+.order-wrap .total-blo .total-list.data-v-d98bfd66:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-d98bfd66{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-d98bfd66{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-d98bfd66{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-d98bfd66:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-d98bfd66:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-d98bfd66{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-d98bfd66:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-d98bfd66:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-d98bfd66{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-d98bfd66{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-d98bfd66{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-d98bfd66{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

ghsApp/dist/build/mp-weixin/pagesStorehouse/shop/list.js

@@ -1 +1,5 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesStorehouse/shop/list"],{"0b01":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={components:{},data:function(){return{tabs:[{name:"全部",key:""},{name:"草稿",key:"01"},{name:"已盘点",key:"02"}],shopList:[{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"02"},{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"02"},{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"01"}]}}};e.default=a},4374:function(t,e,n){"use strict";n.r(e);var a=n("0b01"),u=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(c);e["default"]=u.a},6559:function(t,e,n){"use strict";n.r(e);var a=n("d9fa"),u=n("4374");for(var c in u)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(c);n("fb8c");var o,r=n("41a2"),i=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"38b29ab4",null,!1,a["a"],o);e["default"]=i.exports},a5bc:function(t,e,n){"use strict";(function(t){n("6cdc");a(n("e3ac"));var e=a(n("6559"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("1480")["createPage"])},d9fa:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return a}));var u=function(){var t=this,e=t.$createElement;t._self._c},c=[]},ec41:function(t,e,n){},fb8c:function(t,e,n){"use strict";var a=n("ec41"),u=n.n(a);u.a}},[["a5bc","common/runtime","common/vendor"]]]);
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesStorehouse/shop/list"],{"0b01":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={components:{},data:function(){return{tabs:[{name:"全部",key:""},{name:"草稿",key:"01"},{name:"已盘点",key:"02"}],shopList:[{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"02"},{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"02"},{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"01"}]}}};e.default=a},4374:function(t,e,n){"use strict";n.r(e);var a=n("0b01"),u=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(c);e["default"]=u.a},6559:function(t,e,n){"use strict";n.r(e);var a=n("d9fa"),u=n("4374");for(var c in u)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(c);n("fb8c");var o,r=n("41a2"),i=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"38b29ab4",null,!1,a["a"],o);e["default"]=i.exports},a5bc:function(t,e,n){"use strict";(function(t){n("6cdc");a(n("e3ac"));var e=a(n("6559"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("1480")["createPage"])},d9fa:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return a}));var u=function(){var t=this,e=t.$createElement;t._self._c},c=[]},ec41:function(t,e,n){},fb8c:function(t,e,n){"use strict";var a=n("ec41"),u=n.n(a);u.a}},[["a5bc","common/runtime","common/vendor"]]]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesStorehouse/shop/list"],{"3a05":function(t,e,n){},4374:function(t,e,n){"use strict";n.r(e);var a=n("5563"),u=n.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=u.a},5563:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={components:{},data:function(){return{tabs:[{name:"全部",key:""},{name:"草稿",key:"01"},{name:"已盘点",key:"02"}],shopList:[{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"02"},{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"02"},{orderNo:"PD20201217212800156",name:"小许",dateTime:"2020-7-10 21:50",count:"101",status:"01"}]}}};e.default=a},6559:function(t,e,n){"use strict";n.r(e);var a=n("d9fa"),u=n("4374");for(var o in u)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(o);n("fb8c");var r,c=n("0095"),f=Object(c["a"])(u["default"],a["b"],a["c"],!1,null,"38b29ab4",null,!1,a["a"],r);e["default"]=f.exports},a5bc:function(t,e,n){"use strict";(function(t){n("6cdc");a(n("4a15"));var e=a(n("6559"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("f3be")["createPage"])},d9fa:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return a}));var u=function(){var t=this,e=t.$createElement;t._self._c},o=[]},fb8c:function(t,e,n){"use strict";var a=n("3a05"),u=n.n(a);u.a}},[["a5bc","common/runtime","common/vendor"]]]);
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

ghsApp/src/admin/home/order.vue

@@ -129,7 +129,6 @@
       themeColor="#4C83D6"
       fields="day"
     ></rangeDatePick>
-    <kd-entrance></kd-entrance>
   </div>
 </template>
 

ghsApp/src/admin/shop/add.vue

@@ -5,7 +5,7 @@
 			<div class="module-com input-line-wrap">
 				<tui-list-cell class="line-cell" :hover="false">
 					<div class="tui-title required">门店名称</div>
-					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称" maxlength="50" type="text" />
+					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称，如同安店" maxlength="50" type="text" />
 				</tui-list-cell>
 			<tui-list-cell class="line-cell" :hover="false">
 			<div class="tui-title required" >门店图片</div>

ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -53,7 +53,6 @@
 		<div class="app-footer open_btn">
 			<div @click="addEvent" class="admin-button-com middle blue">新增盘点</div>
 		</div>
-    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

hdApp/dist/build/mp-weixin/admin/billing/confirm.js

@@ -1 +1,5 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/billing/confirm"],{1376:function(n,t,e){"use strict";(function(n){e("6cdc");u(e("e3ac"));var t=u(e("84dc"));function u(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e("1480")["createPage"])},"5b79":function(n,t,e){"use strict";e.r(t);var u=e("b806"),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},"84dc":function(n,t,e){"use strict";e.r(t);var u=e("8e70"),c=e("5b79");for(var r in c)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(r);e("ae96");var a,i=e("41a2"),o=Object(i["a"])(c["default"],u["b"],u["c"],!1,null,"9dac1220",null,!1,u["a"],a);t["default"]=o.exports},"8e70":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=[]},ae96:function(n,t,e){"use strict";var u=e("d089"),c=e.n(u);c.a},b806:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"BillingConfirm",components:{},data:function(){return{showRegion:!1}},methods:{}};t.default=u},d089:function(n,t,e){}},[["1376","common/runtime","common/vendor"]]]);
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/billing/confirm"],{1376:function(n,t,e){"use strict";(function(n){e("6cdc");u(e("e3ac"));var t=u(e("84dc"));function u(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e("1480")["createPage"])},"5b79":function(n,t,e){"use strict";e.r(t);var u=e("b806"),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},"84dc":function(n,t,e){"use strict";e.r(t);var u=e("8e70"),c=e("5b79");for(var r in c)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(r);e("ae96");var a,i=e("41a2"),o=Object(i["a"])(c["default"],u["b"],u["c"],!1,null,"9dac1220",null,!1,u["a"],a);t["default"]=o.exports},"8e70":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=[]},ae96:function(n,t,e){"use strict";var u=e("d089"),c=e.n(u);c.a},b806:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"BillingConfirm",components:{},data:function(){return{showRegion:!1}},methods:{}};t.default=u},d089:function(n,t,e){}},[["1376","common/runtime","common/vendor"]]]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/billing/confirm"],{"0255":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=[]},1376:function(n,t,e){"use strict";(function(n){e("6cdc");u(e("4a15"));var t=u(e("84dc"));function u(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e("f3be")["createPage"])},"43f8":function(n,t,e){},"52e1":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"BillingConfirm",components:{},data:function(){return{showRegion:!1}},methods:{}};t.default=u},"5b79":function(n,t,e){"use strict";e.r(t);var u=e("52e1"),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},"84dc":function(n,t,e){"use strict";e.r(t);var u=e("0255"),c=e("5b79");for(var r in c)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(r);e("cb7f");var i,o=e("0095"),f=Object(o["a"])(c["default"],u["b"],u["c"],!1,null,"5343b845",null,!1,u["a"],i);t["default"]=f.exports},cb7f:function(n,t,e){"use strict";var u=e("43f8"),c=e.n(u);c.a}},[["1376","common/runtime","common/vendor"]]]);
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/billing/confirm.wxml

@@ -1 +1,5 @@
-<view class="confirm-page data-v-9dac1220"><view class="top-view data-v-9dac1220"><view class="top-line data-v-9dac1220"><view class="line-label data-v-9dac1220">订单号</view><view class="line-value data-v-9dac1220">201923121</view></view><view class="top-line data-v-9dac1220"><view class="line-label data-v-9dac1220">金额</view><view class="line-value data-v-9dac1220">￥201923121</view></view><view class="top-line data-v-9dac1220"><view class="line-label data-v-9dac1220">配送方式</view><view class="line-value data-v-9dac1220">201923121</view></view><view class="top-line data-v-9dac1220"><view class="line-label data-v-9dac1220">配送时间</view><view class="line-value data-v-9dac1220">201923121</view></view></view><view class="code-view data-v-9dac1220"><view class="code-title data-v-9dac1220">扫码付款</view><view class="code-image data-v-9dac1220"><image src="{{constant.imgUrl+'/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg'}}" alt="商品图" class="data-v-9dac1220"></image></view><button data-event-opts="{{[['tap',[['formSubmit',['$event']]]]]}}" class="admin-button-com big data-v-9dac1220" bindtap="__e">延期付</button></view></view>
+<<<<<<< HEAD
+<view class="confirm-page data-v-9dac1220"><view class="top-view data-v-9dac1220"><view class="top-line data-v-9dac1220"><view class="line-label data-v-9dac1220">订单号</view><view class="line-value data-v-9dac1220">201923121</view></view><view class="top-line data-v-9dac1220"><view class="line-label data-v-9dac1220">金额</view><view class="line-value data-v-9dac1220">￥201923121</view></view><view class="top-line data-v-9dac1220"><view class="line-label data-v-9dac1220">配送方式</view><view class="line-value data-v-9dac1220">201923121</view></view><view class="top-line data-v-9dac1220"><view class="line-label data-v-9dac1220">配送时间</view><view class="line-value data-v-9dac1220">201923121</view></view></view><view class="code-view data-v-9dac1220"><view class="code-title data-v-9dac1220">扫码付款</view><view class="code-image data-v-9dac1220"><image src="{{constant.imgUrl+'/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg'}}" alt="商品图" class="data-v-9dac1220"></image></view><button data-event-opts="{{[['tap',[['formSubmit',['$event']]]]]}}" class="admin-button-com big data-v-9dac1220" bindtap="__e">延期付</button></view></view>
+=======
+<view class="confirm-page data-v-5343b845"><view class="top-view data-v-5343b845"><view class="top-line data-v-5343b845"><view class="line-label data-v-5343b845">订单号</view><view class="line-value data-v-5343b845">201923121</view></view><view class="top-line data-v-5343b845"><view class="line-label data-v-5343b845">金额</view><view class="line-value data-v-5343b845">￥201923121</view></view><view class="top-line data-v-5343b845"><view class="line-label data-v-5343b845">配送方式</view><view class="line-value data-v-5343b845">201923121</view></view><view class="top-line data-v-5343b845"><view class="line-label data-v-5343b845">配送时间</view><view class="line-value data-v-5343b845">201923121</view></view></view><view class="code-view data-v-5343b845"><view class="code-title data-v-5343b845">扫码付款</view><view class="code-image data-v-5343b845"><image src="{{constant.imgUrl+'/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg'}}" alt="商品图" class="data-v-5343b845"></image></view><button data-event-opts="{{[['tap',[['formSubmit',['$event']]]]]}}" class="admin-button-com big data-v-5343b845" bindtap="__e">延期付</button></view></view>
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/billing/confirm.wxss

@@ -1 +1,5 @@
-.confirm-page.data-v-9dac1220{position:relative;background-color:#f0f2f6;height:100%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}.confirm-page .top-view.data-v-9dac1220{padding:40rpx 30rpx;background-color:#fff}.confirm-page .top-view .top-line.data-v-9dac1220{margin-bottom:20rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.confirm-page .top-view .top-line .line-label.data-v-9dac1220{width:150rpx;color:#666;font-size:28rpx}.confirm-page .top-view .top-line .line-value.data-v-9dac1220{color:#333;font-size:28rpx}.confirm-page .code-view.data-v-9dac1220{padding:60rpx 100rpx;margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;background-color:#fff}.confirm-page .code-view .code-title.data-v-9dac1220{color:#333;font-size:32rpx}.confirm-page .code-view .code-image.data-v-9dac1220{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;margin:60rpx 0 80rpx;width:460rpx;height:460rpx;border:1rpx solid rgba(3,0,0,.1)}.confirm-page .code-view .code-image image.data-v-9dac1220{width:406rpx;height:406rpx}.confirm-page .code-view .admin-button-com.data-v-9dac1220{width:100%}
+<<<<<<< HEAD
+.confirm-page.data-v-9dac1220{position:relative;background-color:#f0f2f6;height:100%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}.confirm-page .top-view.data-v-9dac1220{padding:40rpx 30rpx;background-color:#fff}.confirm-page .top-view .top-line.data-v-9dac1220{margin-bottom:20rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.confirm-page .top-view .top-line .line-label.data-v-9dac1220{width:150rpx;color:#666;font-size:28rpx}.confirm-page .top-view .top-line .line-value.data-v-9dac1220{color:#333;font-size:28rpx}.confirm-page .code-view.data-v-9dac1220{padding:60rpx 100rpx;margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;background-color:#fff}.confirm-page .code-view .code-title.data-v-9dac1220{color:#333;font-size:32rpx}.confirm-page .code-view .code-image.data-v-9dac1220{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;margin:60rpx 0 80rpx;width:460rpx;height:460rpx;border:1rpx solid rgba(3,0,0,.1)}.confirm-page .code-view .code-image image.data-v-9dac1220{width:406rpx;height:406rpx}.confirm-page .code-view .admin-button-com.data-v-9dac1220{width:100%}
+=======
+.confirm-page.data-v-5343b845{position:relative;background-color:#f0f2f6;height:100%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}.confirm-page .top-view.data-v-5343b845{padding:40rpx 30rpx;background-color:#fff}.confirm-page .top-view .top-line.data-v-5343b845{margin-bottom:20rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.confirm-page .top-view .top-line .line-label.data-v-5343b845{width:150rpx;color:#666;font-size:28rpx}.confirm-page .top-view .top-line .line-value.data-v-5343b845{color:#333;font-size:28rpx}.confirm-page .code-view.data-v-5343b845{padding:60rpx 100rpx;margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;background-color:#fff}.confirm-page .code-view .code-title.data-v-5343b845{color:#333;font-size:32rpx}.confirm-page .code-view .code-image.data-v-5343b845{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;margin:60rpx 0 80rpx;width:460rpx;height:460rpx;border:1rpx solid rgba(3,0,0,.1)}.confirm-page .code-view .code-image image.data-v-5343b845{width:406rpx;height:406rpx}.confirm-page .code-view .admin-button-com.data-v-5343b845{width:100%}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/billing/result.wxss

@@ -1 +1,5 @@
-.admin-button-com.data-v-24b42afa{margin-bottom:20rpx;width:100%}.zuhe-box.data-v-24b42afa{width:100%;background-color:#fff}.zuhe-box .zuhe-remark.data-v-24b42afa{color:#333;font-size:32rpx;font-weight:700;line-height:88rpx;padding-left:30rpx;border-bottom:1rpx solid #eee}.zuhe-box .zuhe-center.data-v-24b42afa{margin-top:20rpx;font-size:28rpx;margin:0 30rpx;height:90rpx;box-sizing:border-box}.zuhe-box .zuhe-center .zuhe-title.data-v-24b42afa{color:#666}.zuhe-box .zuhe-center .zuhe-val.data-v-24b42afa{position:relative;width:70%;height:60rpx;padding:10rpx;color:#333;border:1rpx solid #868686;border:none}.zuhe-box .zuhe-center .zuhe-val.active.data-v-24b42afa:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#868686;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-12rpx;right:30rpx}.zuhe-box .border.data-v-24b42afa{border-bottom:1rpx solid #eee}
+<<<<<<< HEAD
+.admin-button-com.data-v-24b42afa{margin-bottom:20rpx;width:100%}.zuhe-box.data-v-24b42afa{width:100%;background-color:#fff}.zuhe-box .zuhe-remark.data-v-24b42afa{color:#333;font-size:32rpx;font-weight:700;line-height:88rpx;padding-left:30rpx;border-bottom:1rpx solid #eee}.zuhe-box .zuhe-center.data-v-24b42afa{margin-top:20rpx;font-size:28rpx;margin:0 30rpx;height:90rpx;box-sizing:border-box}.zuhe-box .zuhe-center .zuhe-title.data-v-24b42afa{color:#666}.zuhe-box .zuhe-center .zuhe-val.data-v-24b42afa{position:relative;width:70%;height:60rpx;padding:10rpx;color:#333;border:1rpx solid #868686;border:none}.zuhe-box .zuhe-center .zuhe-val.active.data-v-24b42afa:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#868686;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-12rpx;right:30rpx}.zuhe-box .border.data-v-24b42afa{border-bottom:1rpx solid #eee}
+=======
+.admin-button-com.data-v-c4acde78{margin-bottom:20rpx;width:100%}.zuhe-box.data-v-c4acde78{width:100%;background-color:#fff}.zuhe-box .zuhe-remark.data-v-c4acde78{color:#333;font-size:32rpx;font-weight:700;line-height:88rpx;padding-left:30rpx;border-bottom:1rpx solid #eee}.zuhe-box .zuhe-center.data-v-c4acde78{margin-top:20rpx;font-size:28rpx;margin:0 30rpx;height:90rpx;box-sizing:border-box}.zuhe-box .zuhe-center .zuhe-title.data-v-c4acde78{color:#666}.zuhe-box .zuhe-center .zuhe-val.data-v-c4acde78{position:relative;width:70%;height:60rpx;padding:10rpx;color:#333;border:1rpx solid #868686;border:none}.zuhe-box .zuhe-center .zuhe-val.active.data-v-c4acde78:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#868686;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-12rpx;right:30rpx}.zuhe-box .border.data-v-c4acde78{border-bottom:1rpx solid #eee}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/home/apply.wxml

@@ -1 +1,5 @@
-<view class="app-content data-v-2f41526f"><view class="apply-content_box data-v-2f41526f"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-2f41526f"><view class="tit data-v-2f41526f">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-2f41526f"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-2f41526f"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-2f41526f"><view class="tabs-img _div data-v-2f41526f"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-2f41526f"></image></view><view class="tabs-name _div data-v-2f41526f">{{s.name}}</view></view></view></block></view></view></block></view><kd-entrance vue-id="23de2e0c-1" class="data-v-2f41526f" bind:__l="__l"></kd-entrance></view>
+<<<<<<< HEAD
+<view class="app-content data-v-2f41526f"><view class="apply-content_box data-v-2f41526f"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-2f41526f"><view class="tit data-v-2f41526f">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-2f41526f"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-2f41526f"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-2f41526f"><view class="tabs-img _div data-v-2f41526f"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-2f41526f"></image></view><view class="tabs-name _div data-v-2f41526f">{{s.name}}</view></view></view></block></view></view></block></view><kd-entrance vue-id="23de2e0c-1" class="data-v-2f41526f" bind:__l="__l"></kd-entrance></view>
+=======
+<view class="app-content data-v-2a1fae66"><view class="apply-content_box data-v-2a1fae66"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-2a1fae66"><view class="tit data-v-2a1fae66">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-2a1fae66"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-2a1fae66"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-2a1fae66"><view class="tabs-img _div data-v-2a1fae66"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-2a1fae66"></image></view><view class="tabs-name _div data-v-2a1fae66">{{s.name}}</view></view></view></block></view></view></block></view><kd-entrance vue-id="23de2e0c-1" class="data-v-2a1fae66" bind:__l="__l"></kd-entrance></view>
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/home/apply.wxss

@@ -1 +1,5 @@
-.apply-content_box.data-v-2f41526f{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-2f41526f{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-2f41526f{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-2f41526f{padding:40rpx 0rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.apply-content_box .tabs-wrap .tabs-list.data-v-2f41526f{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-2f41526f{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-2f41526f{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-2f41526f{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-2f41526f:nth-child(-n + 4){margin-top:0}
+<<<<<<< HEAD
+.apply-content_box.data-v-2f41526f{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-2f41526f{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-2f41526f{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-2f41526f{padding:40rpx 0rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.apply-content_box .tabs-wrap .tabs-list.data-v-2f41526f{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-2f41526f{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-2f41526f{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-2f41526f{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-2f41526f:nth-child(-n + 4){margin-top:0}
+=======
+.apply-content_box.data-v-2a1fae66{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-2a1fae66{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-2a1fae66{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-2a1fae66{padding:40rpx 0rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.apply-content_box .tabs-wrap .tabs-list.data-v-2a1fae66{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-2a1fae66{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-2a1fae66{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-2a1fae66{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-2a1fae66:nth-child(-n + 4){margin-top:0}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

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

hdApp/dist/build/mp-weixin/admin/order/components/card-name.json

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

hdApp/dist/build/mp-weixin/admin/order/components/sel-mention.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/order/components/sel-mention"],{"05f8":function(n,e,t){"use strict";var u=t("4066"),o=t.n(u);o.a},"3d49":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u=function(){t.e("admin/home/components/plugin/time-axis").then(function(){return resolve(t("9193"))}.bind(null,t)).catch(t.oe)},o=function(){t.e("admin/home/components/plugin/timeaxis-item").then(function(){return resolve(t("9758"))}.bind(null,t)).catch(t.oe)},i={name:"sel-mention-module",components:{TimeAxis:u,TimeaxisItem:o},props:{query:{type:Object,default:function(){}},orderData:{type:Object,default:function(){}},orderComData:{type:Array,default:function(){return[]}}}};e.default=i},4066:function(n,e,t){},e136:function(n,e,t){"use strict";var u;t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return u}));var o=function(){var n=this,e=n.$createElement;n._self._c},i=[]},e82d:function(n,e,t){"use strict";t.r(e);var u=t("e136"),o=t("ecc6");for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);t("05f8");var r,c=t("41a2"),a=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"0a3211fc",null,!1,u["a"],r);e["default"]=a.exports},ecc6:function(n,e,t){"use strict";t.r(e);var u=t("3d49"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=o.a}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/order/components/sel-mention"],{"05f8":function(n,e,t){"use strict";var u=t("ea96"),o=t.n(u);o.a},"8ca5":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u=function(){t.e("admin/home/components/plugin/time-axis").then(function(){return resolve(t("9193"))}.bind(null,t)).catch(t.oe)},o=function(){t.e("admin/home/components/plugin/timeaxis-item").then(function(){return resolve(t("9758"))}.bind(null,t)).catch(t.oe)},c={name:"sel-mention-module",components:{TimeAxis:u,TimeaxisItem:o},props:{query:{type:Object,default:function(){}},orderData:{type:Object,default:function(){}},orderComData:{type:Array,default:function(){return[]}}}};e.default=c},e136:function(n,e,t){"use strict";var u;t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var o=function(){var n=this,e=n.$createElement;n._self._c},c=[]},e82d:function(n,e,t){"use strict";t.r(e);var u=t("e136"),o=t("ecc6");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("05f8");var i,r=t("0095"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"0a3211fc",null,!1,u["a"],i);e["default"]=a.exports},ea96:function(n,e,t){},ecc6:function(n,e,t){"use strict";t.r(e);var u=t("8ca5"),o=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=o.a}}]);
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'admin/order/components/sel-mention-create-component',
     {

hdApp/dist/build/mp-weixin/admin/recharge/renew.js

@@ -1 +1,5 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/recharge/renew"],{"23c3":function(n,e,t){"use strict";t.r(e);var c=t("a8df"),a=t("b753");for(var u in a)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(u);t("f9a2");var o,r=t("41a2"),i=Object(r["a"])(a["default"],c["b"],c["c"],!1,null,"4b871a4e",null,!1,c["a"],o);e["default"]=i.exports},2931:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var c=t("94fc"),a=u(t("3bff"));function u(n){return n&&n.__esModule?n:{default:n}}var o={name:"recharge-renew",data:function(){return{initData:{}}},onLoad:function(){},methods:{init:function(){this._getDet()},_getDet:function(){var n=this;(0,c.rechargeRenew)().then((function(e){console.log(e),n.initData=e.data})).catch((function(n){console.log(n)}))},onceRecharge:function(){var n=this;(0,c.rechargeRenewPay)().then((function(e){console.log(e),(0,a.default)(e.data,n.getSuccess,n.getError)})).catch((function(n){console.log(n)}))},getSuccess:function(){n.navigateTo({url:"/admin/recharge/rechargeSuccess"})},getError:function(){this.$msg("支付失败!")},goBuy:function(){n.navigateTo({url:"/pagesClient/official/index"})}}};e.default=o}).call(this,t("1480")["default"])},"2c22":function(n,e,t){},a8df:function(n,e,t){"use strict";var c;t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return c}));var a=function(){var n=this,e=n.$createElement;n._self._c},u=[]},b753:function(n,e,t){"use strict";t.r(e);var c=t("2931"),a=t.n(c);for(var u in c)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(u);e["default"]=a.a},eb91:function(n,e,t){"use strict";(function(n){t("6cdc");c(t("e3ac"));var e=c(t("23c3"));function c(n){return n&&n.__esModule?n:{default:n}}n(e.default)}).call(this,t("1480")["createPage"])},f9a2:function(n,e,t){"use strict";var c=t("2c22"),a=t.n(c);a.a}},[["eb91","common/runtime","common/vendor"]]]);
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/recharge/renew"],{"23c3":function(n,e,t){"use strict";t.r(e);var c=t("a8df"),a=t("b753");for(var u in a)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(u);t("f9a2");var o,r=t("41a2"),i=Object(r["a"])(a["default"],c["b"],c["c"],!1,null,"4b871a4e",null,!1,c["a"],o);e["default"]=i.exports},2931:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var c=t("94fc"),a=u(t("3bff"));function u(n){return n&&n.__esModule?n:{default:n}}var o={name:"recharge-renew",data:function(){return{initData:{}}},onLoad:function(){},methods:{init:function(){this._getDet()},_getDet:function(){var n=this;(0,c.rechargeRenew)().then((function(e){console.log(e),n.initData=e.data})).catch((function(n){console.log(n)}))},onceRecharge:function(){var n=this;(0,c.rechargeRenewPay)().then((function(e){console.log(e),(0,a.default)(e.data,n.getSuccess,n.getError)})).catch((function(n){console.log(n)}))},getSuccess:function(){n.navigateTo({url:"/admin/recharge/rechargeSuccess"})},getError:function(){this.$msg("支付失败!")},goBuy:function(){n.navigateTo({url:"/pagesClient/official/index"})}}};e.default=o}).call(this,t("1480")["default"])},"2c22":function(n,e,t){},a8df:function(n,e,t){"use strict";var c;t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return c}));var a=function(){var n=this,e=n.$createElement;n._self._c},u=[]},b753:function(n,e,t){"use strict";t.r(e);var c=t("2931"),a=t.n(c);for(var u in c)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(u);e["default"]=a.a},eb91:function(n,e,t){"use strict";(function(n){t("6cdc");c(t("e3ac"));var e=c(t("23c3"));function c(n){return n&&n.__esModule?n:{default:n}}n(e.default)}).call(this,t("1480")["createPage"])},f9a2:function(n,e,t){"use strict";var c=t("2c22"),a=t.n(c);a.a}},[["eb91","common/runtime","common/vendor"]]]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/recharge/renew"],{"23c3":function(e,n,t){"use strict";t.r(n);var c=t("8613"),a=t("b753");for(var u in a)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(u);t("65c8");var o,r=t("0095"),i=Object(r["a"])(a["default"],c["b"],c["c"],!1,null,"e8ec0ccc",null,!1,c["a"],o);n["default"]=i.exports},"65c8":function(e,n,t){"use strict";var c=t("c926"),a=t.n(c);a.a},8613:function(e,n,t){"use strict";var c;t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){return c}));var a=function(){var e=this,n=e.$createElement;e._self._c},u=[]},aa8e:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var c=t("94fc"),a=u(t("3bff"));function u(e){return e&&e.__esModule?e:{default:e}}var o={name:"recharge-renew",data:function(){return{initData:{}}},onLoad:function(){},methods:{init:function(){this._getDet()},_getDet:function(){var e=this;(0,c.rechargeRenew)().then((function(n){console.log(n),e.initData=n.data})).catch((function(e){console.log(e)}))},onceRecharge:function(){var e=this;(0,c.rechargeRenewPay)().then((function(n){console.log(n),(0,a.default)(n.data,e.getSuccess,e.getError)})).catch((function(e){console.log(e)}))},getSuccess:function(){e.navigateTo({url:"/admin/recharge/rechargeSuccess"})},getError:function(){this.$msg("支付失败!")},goBuy:function(){e.navigateTo({url:"/pagesClient/official/index"})}}};n.default=o}).call(this,t("f3be")["default"])},b753:function(e,n,t){"use strict";t.r(n);var c=t("aa8e"),a=t.n(c);for(var u in c)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return c[e]}))}(u);n["default"]=a.a},c926:function(e,n,t){},eb91:function(e,n,t){"use strict";(function(e){t("6cdc");c(t("4a15"));var n=c(t("23c3"));function c(e){return e&&e.__esModule?e:{default:e}}e(n.default)}).call(this,t("f3be")["createPage"])}},[["eb91","common/runtime","common/vendor"]]]);
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/recharge/renew.wxml

@@ -1 +1,5 @@
-<view class="app-content _div data-v-4b871a4e"><view class="recharge_box _div data-v-4b871a4e"><view class="renew data-v-4b871a4e">续费<text style="padding-left:10rpx;" class="data-v-4b871a4e">{{initData.renew}}</text>/年<text data-event-opts="{{[['tap',[['goBuy',['$event']]]]]}}" class="toBuy data-v-4b871a4e" bindtap="__e">去购买</text></view><view class="voucher data-v-4b871a4e">充值<text style="color:#FF3C00;padding-left:10rpx;" class="data-v-4b871a4e">{{initData.recharge+"元"}}</text>，免费使用一年</view><view data-event-opts="{{[['tap',[['onceRecharge',['$event']]]]]}}" class="immediately data-v-4b871a4e" bindtap="__e">立即充值</view><view class="use data-v-4b871a4e">本次充值仅限在<text style="color:#666;padding:0 10rpx;font-weight:700;" class="data-v-4b871a4e">{{initData.merchantName+" "+initData.shopName}}</text>门店使用</view><view class="use use_margin data-v-4b871a4e"><text style="color:#666;" class="data-v-4b871a4e">{{initData.userNum}}</text>人已充值</view><view class="user_avator data-v-4b871a4e"><image src="{{constant.url+'/recharge/has_recharge.png'}}" class="data-v-4b871a4e"></image></view></view></view>
+<<<<<<< HEAD
+<view class="app-content _div data-v-4b871a4e"><view class="recharge_box _div data-v-4b871a4e"><view class="renew data-v-4b871a4e">续费<text style="padding-left:10rpx;" class="data-v-4b871a4e">{{initData.renew}}</text>/年<text data-event-opts="{{[['tap',[['goBuy',['$event']]]]]}}" class="toBuy data-v-4b871a4e" bindtap="__e">去购买</text></view><view class="voucher data-v-4b871a4e">充值<text style="color:#FF3C00;padding-left:10rpx;" class="data-v-4b871a4e">{{initData.recharge+"元"}}</text>，免费使用一年</view><view data-event-opts="{{[['tap',[['onceRecharge',['$event']]]]]}}" class="immediately data-v-4b871a4e" bindtap="__e">立即充值</view><view class="use data-v-4b871a4e">本次充值仅限在<text style="color:#666;padding:0 10rpx;font-weight:700;" class="data-v-4b871a4e">{{initData.merchantName+" "+initData.shopName}}</text>门店使用</view><view class="use use_margin data-v-4b871a4e"><text style="color:#666;" class="data-v-4b871a4e">{{initData.userNum}}</text>人已充值</view><view class="user_avator data-v-4b871a4e"><image src="{{constant.url+'/recharge/has_recharge.png'}}" class="data-v-4b871a4e"></image></view></view></view>
+=======
+<view class="app-content _div data-v-e8ec0ccc"><view class="recharge_box _div data-v-e8ec0ccc"><view class="renew data-v-e8ec0ccc">续费<text style="padding-left:10rpx;" class="data-v-e8ec0ccc">{{initData.renew}}</text>/年<text data-event-opts="{{[['tap',[['goBuy',['$event']]]]]}}" class="toBuy data-v-e8ec0ccc" bindtap="__e">去购买</text></view><view class="voucher data-v-e8ec0ccc">充值<text style="color:#FF3C00;padding-left:10rpx;" class="data-v-e8ec0ccc">{{initData.recharge+"元"}}</text>，免费使用一年</view><view data-event-opts="{{[['tap',[['onceRecharge',['$event']]]]]}}" class="immediately data-v-e8ec0ccc" bindtap="__e">立即充值</view><view class="use data-v-e8ec0ccc">本次充值仅限在<text style="color:#666;padding:0 10rpx;font-weight:700;" class="data-v-e8ec0ccc">{{initData.merchantName+" "+initData.shopName}}</text>门店使用</view><view class="use use_margin data-v-e8ec0ccc"><text style="color:#666;" class="data-v-e8ec0ccc">{{initData.userNum}}</text>人已充值</view><view class="user_avator data-v-e8ec0ccc"><image src="{{constant.url+'/recharge/has_recharge.png'}}" class="data-v-e8ec0ccc"></image></view></view></view>
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/recharge/renew.wxss

@@ -1 +1,5 @@
-.app-content.data-v-4b871a4e{padding-top:1rpx;width:100vw;height:100vh;background:url(https://img.huaml.com/recharge/free_renew.png);background-size:cover;background-position:50%;background-attachment:fixed;position:relative}.app-content .recharge_box.data-v-4b871a4e{position:absolute;bottom:4%;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);box-shadow:0rpx 3rpx 13rpx 0rpx rgba(221,0,0,.36);margin:60% auto 0;height:617rpx;width:640rpx;border-radius:20rpx;background:#fff}.app-content .recharge_box > .renew.data-v-4b871a4e{margin-top:70rpx;text-align:center;font-size:28rpx;color:#333}.app-content .recharge_box > .renew > .toBuy.data-v-4b871a4e{padding-left:10rpx;color:#3385ff;position:relative}.app-content .recharge_box > .renew > .toBuy.data-v-4b871a4e::after{position:absolute;right:-15rpx;top:50%;content:"";-webkit-transform:translateY(-50%) rotate(225deg);transform:translateY(-50%) rotate(225deg);width:10rpx;height:10rpx;border-left:1rpx solid #3385ff;border-bottom:1rpx solid #3385ff}.app-content .recharge_box > .voucher.data-v-4b871a4e{font-size:32rpx;font-weight:700;margin-top:70rpx;text-align:center;white-space:pre-wrap}.app-content .recharge_box > .immediately.data-v-4b871a4e{width:520rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(bottom,#fe921e,#ffd21f);background:linear-gradient(0deg,#fe921e,#ffd21f);border-radius:44rpx;margin:40rpx auto 0;font-size:32rpx;text-align:center;color:#fff}.app-content .recharge_box > .use.data-v-4b871a4e{color:#999;font-size:26rpx;text-align:center;margin-top:20rpx}.app-content .recharge_box > .use_margin.data-v-4b871a4e{margin-top:80rpx}.app-content .recharge_box > .user_avator.data-v-4b871a4e{text-align:center;margin-top:20rpx}.app-content .recharge_box > .user_avator > image.data-v-4b871a4e{width:285rpx;height:49rpx;margin:0 auto}
+<<<<<<< HEAD
+.app-content.data-v-4b871a4e{padding-top:1rpx;width:100vw;height:100vh;background:url(https://img.huaml.com/recharge/free_renew.png);background-size:cover;background-position:50%;background-attachment:fixed;position:relative}.app-content .recharge_box.data-v-4b871a4e{position:absolute;bottom:4%;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);box-shadow:0rpx 3rpx 13rpx 0rpx rgba(221,0,0,.36);margin:60% auto 0;height:617rpx;width:640rpx;border-radius:20rpx;background:#fff}.app-content .recharge_box > .renew.data-v-4b871a4e{margin-top:70rpx;text-align:center;font-size:28rpx;color:#333}.app-content .recharge_box > .renew > .toBuy.data-v-4b871a4e{padding-left:10rpx;color:#3385ff;position:relative}.app-content .recharge_box > .renew > .toBuy.data-v-4b871a4e::after{position:absolute;right:-15rpx;top:50%;content:"";-webkit-transform:translateY(-50%) rotate(225deg);transform:translateY(-50%) rotate(225deg);width:10rpx;height:10rpx;border-left:1rpx solid #3385ff;border-bottom:1rpx solid #3385ff}.app-content .recharge_box > .voucher.data-v-4b871a4e{font-size:32rpx;font-weight:700;margin-top:70rpx;text-align:center;white-space:pre-wrap}.app-content .recharge_box > .immediately.data-v-4b871a4e{width:520rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(bottom,#fe921e,#ffd21f);background:linear-gradient(0deg,#fe921e,#ffd21f);border-radius:44rpx;margin:40rpx auto 0;font-size:32rpx;text-align:center;color:#fff}.app-content .recharge_box > .use.data-v-4b871a4e{color:#999;font-size:26rpx;text-align:center;margin-top:20rpx}.app-content .recharge_box > .use_margin.data-v-4b871a4e{margin-top:80rpx}.app-content .recharge_box > .user_avator.data-v-4b871a4e{text-align:center;margin-top:20rpx}.app-content .recharge_box > .user_avator > image.data-v-4b871a4e{width:285rpx;height:49rpx;margin:0 auto}
+=======
+.app-content.data-v-e8ec0ccc{padding-top:1rpx;width:100vw;height:100vh;background:url(https://img.huaml.com/recharge/free_renew.png);background-size:cover;background-position:50%;background-attachment:fixed;position:relative}.app-content .recharge_box.data-v-e8ec0ccc{position:absolute;bottom:4%;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);box-shadow:0rpx 3rpx 13rpx 0rpx rgba(221,0,0,.36);margin:60% auto 0;height:617rpx;width:640rpx;border-radius:20rpx;background:#fff}.app-content .recharge_box > .renew.data-v-e8ec0ccc{margin-top:70rpx;text-align:center;font-size:28rpx;color:#333}.app-content .recharge_box > .renew > .toBuy.data-v-e8ec0ccc{padding-left:10rpx;color:#3385ff;position:relative}.app-content .recharge_box > .renew > .toBuy.data-v-e8ec0ccc::after{position:absolute;right:-15rpx;top:50%;content:"";-webkit-transform:translateY(-50%) rotate(225deg);transform:translateY(-50%) rotate(225deg);width:10rpx;height:10rpx;border-left:1rpx solid #3385ff;border-bottom:1rpx solid #3385ff}.app-content .recharge_box > .voucher.data-v-e8ec0ccc{font-size:32rpx;font-weight:700;margin-top:70rpx;text-align:center;white-space:pre-wrap}.app-content .recharge_box > .immediately.data-v-e8ec0ccc{width:520rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(bottom,#fe921e,#ffd21f);background:linear-gradient(0deg,#fe921e,#ffd21f);border-radius:44rpx;margin:40rpx auto 0;font-size:32rpx;text-align:center;color:#fff}.app-content .recharge_box > .use.data-v-e8ec0ccc{color:#999;font-size:26rpx;text-align:center;margin-top:20rpx}.app-content .recharge_box > .use_margin.data-v-e8ec0ccc{margin-top:80rpx}.app-content .recharge_box > .user_avator.data-v-e8ec0ccc{text-align:center;margin-top:20rpx}.app-content .recharge_box > .user_avator > image.data-v-e8ec0ccc{width:285rpx;height:49rpx;margin:0 auto}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/shop/add.wxss

@@ -1 +1,5 @@
-.app-content.data-v-1bdccae4{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-1bdccae4{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-1bdccae4{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-1bdccae4{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-1bdccae4{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-1bdccae4{height:240rpx}.confirm-btn.data-v-1bdccae4{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-1bdccae4{width:100%}
+<<<<<<< HEAD
+.app-content.data-v-1bdccae4{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-1bdccae4{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-1bdccae4{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-1bdccae4{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-1bdccae4{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-1bdccae4{height:240rpx}.confirm-btn.data-v-1bdccae4{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-1bdccae4{width:100%}
+=======
+.app-content.data-v-36835a0c{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-36835a0c{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-36835a0c{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-36835a0c{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-36835a0c{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-36835a0c{height:240rpx}.confirm-btn.data-v-36835a0c{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-36835a0c{width:100%}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/admin/staff/add.wxss

@@ -1 +1,5 @@
-.app-content.data-v-ee51c142{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-ee51c142{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-ee51c142{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-ee51c142{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-ee51c142{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-ee51c142{height:240rpx}.confirm-btn.data-v-ee51c142{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-ee51c142{width:100%}
+<<<<<<< HEAD
+.app-content.data-v-ee51c142{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-ee51c142{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-ee51c142{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-ee51c142{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-ee51c142{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-ee51c142{height:240rpx}.confirm-btn.data-v-ee51c142{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-ee51c142{width:100%}
+=======
+.app-content.data-v-0dec5666{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-0dec5666{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-0dec5666{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-0dec5666{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-0dec5666{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-0dec5666{height:240rpx}.confirm-btn.data-v-0dec5666{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-0dec5666{width:100%}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/components/app-date-picker.json

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

hdApp/dist/build/mp-weixin/components/app-uploader.json

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

hdApp/dist/build/mp-weixin/components/app-wrapper-empty.json

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

hdApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

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

hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json

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

hdApp/dist/build/mp-weixin/components/module/app-order-list.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-order-list"],{"2891d":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return u}));var i=function(){var t=this,n=t.$createElement,e=(t._self._c,t.$util.isEmpty(t.info)),u=e?null:t._f("default_img")(t.imgUrl);t.$mp.data=Object.assign({},{$root:{g0:e,f0:u}})},r=[]},"795c":function(t,n,e){"use strict";var u=e("98d1"),i=e.n(u);i.a},"7d55":function(t,n,e){"use strict";e.r(n);var u=e("2891d"),i=e("c41b");for(var r in i)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(r);e("795c");var o,f=e("41a2"),c=Object(f["a"])(i["default"],u["b"],u["c"],!1,null,"2bc005c1",null,!1,u["a"],o);n["default"]=c.exports},"98d1":function(t,n,e){},"9e1f":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={name:"list-module",props:{info:{type:Object,default:function(){}}},data:function(){return{}},computed:{imgUrl:function(){return this.$util.isEmpty(this.info)?"":this.info.smallCoverUrl?this.info.smallCoverUrl:""}},mounted:function(){},methods:{}};n.default=u},c41b:function(t,n,e){"use strict";e.r(n);var u=e("9e1f"),i=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"]=i.a}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-order-list"],{"531f":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return u}));var i=function(){var t=this,n=t.$createElement,e=(t._self._c,t.$util.isEmpty(t.info)),u=e?null:t._f("default_img")(t.imgUrl);t.$mp.data=Object.assign({},{$root:{g0:e,f0:u}})},r=[]},"6dbf":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={name:"list-module",props:{info:{type:Object,default:function(){}}},data:function(){return{}},computed:{imgUrl:function(){return this.$util.isEmpty(this.info)?"":this.info.smallCoverUrl?this.info.smallCoverUrl:""}},mounted:function(){},methods:{}};n.default=u},"7d55":function(t,n,e){"use strict";e.r(n);var u=e("531f"),i=e("c41b");for(var r in i)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(r);e("b4b1");var f,o=e("0095"),a=Object(o["a"])(i["default"],u["b"],u["c"],!1,null,"163b5004",null,!1,u["a"],f);n["default"]=a.exports},b4b1:function(t,n,e){"use strict";var u=e("f2de"),i=e.n(u);i.a},c41b:function(t,n,e){"use strict";e.r(n);var u=e("6dbf"),i=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"]=i.a},f2de:function(t,n,e){}}]);
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/module/app-order-list-create-component',
     {

hdApp/dist/build/mp-weixin/components/module/app-order-list.wxml

@@ -1 +1,5 @@
-<view class="list-module _div data-v-2bc005c1"><block wx:if="{{!$root.g0}}"><block class="data-v-2bc005c1"><view class="list-left _div data-v-2bc005c1"><view class="image _div data-v-2bc005c1"><image style="width:140rpx;height:140rpx;" src="{{$root.f0}}" mode="aspectFit" class="data-v-2bc005c1"></image></view><view class="list-msg _div data-v-2bc005c1"><view class="title _div data-v-2bc005c1">{{info.goodsName||info.title}}</view><block wx:if="{{info.goodsStyle&&info.goodsStyle!='0'||info.goodsStyleName&&info.goodsStyleName!='0'}}"><block class="data-v-2bc005c1"><view class="desc _div data-v-2bc005c1">{{info.goodsStyle||info.goodsStyleName}}</view></block></block></view></view><view class="list-right _div data-v-2bc005c1"><view class="price _div data-v-2bc005c1">{{"￥"+(info.price||info.unitPrice)}}</view><view class="num _div data-v-2bc005c1">{{"*"+(info.buyNum||info.num)}}</view></view></block></block></view>
+<<<<<<< HEAD
+<view class="list-module _div data-v-2bc005c1"><block wx:if="{{!$root.g0}}"><block class="data-v-2bc005c1"><view class="list-left _div data-v-2bc005c1"><view class="image _div data-v-2bc005c1"><image style="width:140rpx;height:140rpx;" src="{{$root.f0}}" mode="aspectFit" class="data-v-2bc005c1"></image></view><view class="list-msg _div data-v-2bc005c1"><view class="title _div data-v-2bc005c1">{{info.goodsName||info.title}}</view><block wx:if="{{info.goodsStyle&&info.goodsStyle!='0'||info.goodsStyleName&&info.goodsStyleName!='0'}}"><block class="data-v-2bc005c1"><view class="desc _div data-v-2bc005c1">{{info.goodsStyle||info.goodsStyleName}}</view></block></block></view></view><view class="list-right _div data-v-2bc005c1"><view class="price _div data-v-2bc005c1">{{"￥"+(info.price||info.unitPrice)}}</view><view class="num _div data-v-2bc005c1">{{"*"+(info.buyNum||info.num)}}</view></view></block></block></view>
+=======
+<view class="list-module _div data-v-163b5004"><block wx:if="{{!$root.g0}}"><block class="data-v-163b5004"><view class="list-left _div data-v-163b5004"><view class="image _div data-v-163b5004"><image style="width:140rpx;height:140rpx;" src="{{$root.f0}}" mode="aspectFit" class="data-v-163b5004"></image></view><view class="list-msg _div data-v-163b5004"><view class="title _div data-v-163b5004">{{info.goodsName||info.title}}</view><block wx:if="{{info.goodsStyle&&info.goodsStyle!='0'||info.goodsStyleName&&info.goodsStyleName!='0'}}"><block class="data-v-163b5004"><view class="desc _div data-v-163b5004">{{info.goodsStyle||info.goodsStyleName}}</view></block></block></view></view><view class="list-right _div data-v-163b5004"><view class="price _div data-v-163b5004">{{"￥"+(info.price||info.unitPrice)}}</view><view class="num _div data-v-163b5004">{{"*"+(info.buyNum||info.num)}}</view></view></block></block></view>
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/components/module/app-order-list.wxss

@@ -1 +1,5 @@
-.list-module.data-v-2bc005c1{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 0;border-bottom:1rpx solid #eee}.list-module .list-left.data-v-2bc005c1{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.list-module .list-left .image.data-v-2bc005c1{width:140rpx}.list-module .list-left .list-msg.data-v-2bc005c1{margin-left:20rpx}.list-module .list-left .list-msg .title.data-v-2bc005c1{font-size:28rpx;color:#666;margin-bottom:10rpx}.list-module .list-left .list-msg .desc.data-v-2bc005c1{color:#999}.list-module .list-right.data-v-2bc005c1{text-align:right;color:#666}.list-module .list-right .price.data-v-2bc005c1{margin-bottom:70rpx;color:#333}
+<<<<<<< HEAD
+.list-module.data-v-2bc005c1{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 0;border-bottom:1rpx solid #eee}.list-module .list-left.data-v-2bc005c1{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.list-module .list-left .image.data-v-2bc005c1{width:140rpx}.list-module .list-left .list-msg.data-v-2bc005c1{margin-left:20rpx}.list-module .list-left .list-msg .title.data-v-2bc005c1{font-size:28rpx;color:#666;margin-bottom:10rpx}.list-module .list-left .list-msg .desc.data-v-2bc005c1{color:#999}.list-module .list-right.data-v-2bc005c1{text-align:right;color:#666}.list-module .list-right .price.data-v-2bc005c1{margin-bottom:70rpx;color:#333}
+=======
+.list-module.data-v-163b5004{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 0;border-bottom:1rpx solid #eee}.list-module .list-left.data-v-163b5004{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.list-module .list-left .image.data-v-163b5004{width:140rpx}.list-module .list-left .list-msg.data-v-163b5004{margin-left:20rpx}.list-module .list-left .list-msg .title.data-v-163b5004{font-size:28rpx;color:#666;margin-bottom:10rpx}.list-module .list-left .list-msg .desc.data-v-163b5004{color:#999}.list-module .list-right.data-v-163b5004{text-align:right;color:#666}.list-module .list-right .price.data-v-163b5004{margin-bottom:70rpx;color:#333}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/components/none-hd.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/none-hd"],{"397f":function(n,t,e){},"3cb7":function(n,t,e){"use strict";e.r(t);var u=e("9157a"),a=e.n(u);for(var d in u)["default"].indexOf(d)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(d);t["default"]=a.a},8948:function(n,t,e){"use strict";e.r(t);var u=e("9adb"),a=e("3cb7");for(var d in a)["default"].indexOf(d)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(d);e("d154");var o,i=e("41a2"),r=Object(i["a"])(a["default"],u["b"],u["c"],!1,null,"3f404dde",null,!1,u["a"],o);t["default"]=r.exports},"9157a":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{show:{type:Boolean,default:!0},hdShopAdminId:{type:Number,default:0},ghsShopAdminId:{type:Number,default:0}},data:function(){return{constant:this.$constant}},methods:{apply:function(){this.$util.pageTo({url:"/pagesClient/official/index",type:2,query:{ghsShopAdminId:this.ghsShopAdminId,hdShopAdminId:this.hdShopAdminId}})}}};t.default=u},"9adb":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return d})),e.d(t,"a",(function(){return u}));var a=function(){var n=this,t=n.$createElement;n._self._c},d=[]},d154:function(n,t,e){"use strict";var u=e("397f"),a=e.n(u);a.a}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/none-hd"],{"2eec":function(n,t,e){"use strict";var u=e("6443"),o=e.n(u);o.a},"3cb7":function(n,t,e){"use strict";e.r(t);var u=e("eb73"),o=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);t["default"]=o.a},6443:function(n,t,e){},"6b76":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return u}));var o=function(){var n=this,t=n.$createElement;n._self._c},i=[]},8948:function(n,t,e){"use strict";e.r(t);var u=e("6b76"),o=e("3cb7");for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);e("2eec");var a,d=e("0095"),r=Object(d["a"])(o["default"],u["b"],u["c"],!1,null,"201da86f",null,!1,u["a"],a);t["default"]=r.exports},eb73:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{show:{type:Boolean,default:!0},hdShopAdminId:{type:Number,default:0},ghsShopAdminId:{type:Number,default:0}},data:function(){return{constant:this.$constant}},methods:{apply:function(){this.$util.pageTo({url:"/pagesClient/official/index",type:2,query:{ghsShopAdminId:this.ghsShopAdminId,hdShopAdminId:this.hdShopAdminId}})}}};t.default=u}}]);
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/none-hd-create-component',
     {

hdApp/dist/build/mp-weixin/components/none-hd.wxml

@@ -1 +1,5 @@
-<block wx:if="{{show}}"><view class="model data-v-3f404dde"><image class="noData_img data-v-3f404dde" src="{{constant.imgUrl+'/ghs/home/deserve.png'}}"></image><view class="no_data_text data-v-3f404dde">您还没有开店，无法采购哦~</view><view data-event-opts="{{[['tap',[['apply',['$event']]]]]}}" class="freeApply data-v-3f404dde" bindtap="__e">免费开店</view></view></block>
+<<<<<<< HEAD
+<block wx:if="{{show}}"><view class="model data-v-3f404dde"><image class="noData_img data-v-3f404dde" src="{{constant.imgUrl+'/ghs/home/deserve.png'}}"></image><view class="no_data_text data-v-3f404dde">您还没有开店，无法采购哦~</view><view data-event-opts="{{[['tap',[['apply',['$event']]]]]}}" class="freeApply data-v-3f404dde" bindtap="__e">免费开店</view></view></block>
+=======
+<block wx:if="{{show}}"><view class="model data-v-201da86f"><image class="noData_img data-v-201da86f" src="{{constant.imgUrl+'/ghs/home/deserve.png'}}"></image><view class="no_data_text data-v-201da86f">您还没有开店，无法采购哦~</view><view data-event-opts="{{[['tap',[['apply',['$event']]]]]}}" class="freeApply data-v-201da86f" bindtap="__e">免费开店</view></view></block>
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/components/none-hd.wxss

@@ -1 +1,5 @@
-.model.data-v-3f404dde{position:fixed;z-index:9999;top:0;left:0;width:100vw;height:100vh;background:rgba(0,0,0,.6);color:#fff;text-align:center}.model > .noData_img.data-v-3f404dde{width:318rpx;height:318rpx;margin:332rpx auto 0}.model > .no_data_text.data-v-3f404dde{font-size:32rpx;color:#fff;text-align:center;margin:50rpx 0}.model > .freeApply.data-v-3f404dde{width:376rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(left,#3385ff,#33b0ff);background:linear-gradient(90deg,#3385ff,#33b0ff);border-radius:44rpx;margin:0 auto;font-size:32rpx;color:#fff;text-align:center}
+<<<<<<< HEAD
+.model.data-v-3f404dde{position:fixed;z-index:9999;top:0;left:0;width:100vw;height:100vh;background:rgba(0,0,0,.6);color:#fff;text-align:center}.model > .noData_img.data-v-3f404dde{width:318rpx;height:318rpx;margin:332rpx auto 0}.model > .no_data_text.data-v-3f404dde{font-size:32rpx;color:#fff;text-align:center;margin:50rpx 0}.model > .freeApply.data-v-3f404dde{width:376rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(left,#3385ff,#33b0ff);background:linear-gradient(90deg,#3385ff,#33b0ff);border-radius:44rpx;margin:0 auto;font-size:32rpx;color:#fff;text-align:center}
+=======
+.model.data-v-201da86f{position:fixed;z-index:9999;top:0;left:0;width:100vw;height:100vh;background:rgba(0,0,0,.6);color:#fff;text-align:center}.model > .noData_img.data-v-201da86f{width:318rpx;height:318rpx;margin:332rpx auto 0}.model > .no_data_text.data-v-201da86f{font-size:32rpx;color:#fff;text-align:center;margin:50rpx 0}.model > .freeApply.data-v-201da86f{width:376rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(left,#3385ff,#33b0ff);background:linear-gradient(90deg,#3385ff,#33b0ff);border-radius:44rpx;margin:0 auto;font-size:32rpx;color:#fff;text-align:center}
+>>>>>>> 341a0711ea1333ca2ac341189da006cf6d097e06

hdApp/dist/build/mp-weixin/components/plugin/fab.json

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

hdApp/dist/build/mp-weixin/components/plugin/rate.json

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

hdApp/dist/build/mp-weixin/components/plugin/simple-address.json

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

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

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

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

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

hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

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