shish 5 ani în urmă
părinte
comite
199a079d3e
60 a modificat fișierele cu 74 adăugiri și 137 ștergeri
  1. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  2. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/workbench.js
  3. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/workbench.wxml
  4. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/workbench.wxss
  5. 0 0
      ghsApp/dist/build/mp-weixin/admin/staff/add.js
  6. 0 0
      ghsApp/dist/build/mp-weixin/admin/staff/add.wxml
  7. 1 1
      ghsApp/dist/build/mp-weixin/admin/staff/add.wxss
  8. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  9. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-avatar.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-close.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/modal.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/tabs.json
  18. 0 0
      ghsApp/dist/build/mp-weixin/pagesClient/official/apply.js
  19. 0 0
      ghsApp/dist/build/mp-weixin/pagesClient/official/apply.wxml
  20. 1 1
      ghsApp/dist/build/mp-weixin/pagesClient/official/apply.wxss
  21. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  22. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/info.js
  23. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/info.wxml
  24. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/info.wxss
  25. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/order.js
  26. 1 1
      ghsApp/dist/build/mp-weixin/pagesPurchase/order.wxml
  27. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/order.wxss
  28. 1 1
      ghsApp/src/admin/home/workbench.vue
  29. 2 32
      ghsApp/src/admin/staff/add.vue
  30. 0 4
      ghsApp/src/pagesPurchase/info.vue
  31. 3 4
      ghsApp/src/pagesPurchase/order.vue
  32. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  33. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  34. 0 0
      hdApp/dist/build/mp-weixin/admin/staff/add.js
  35. 0 0
      hdApp/dist/build/mp-weixin/admin/staff/add.wxml
  36. 1 1
      hdApp/dist/build/mp-weixin/admin/staff/add.wxss
  37. 2 2
      hdApp/dist/build/mp-weixin/components/app-date-picker.json
  38. 2 2
      hdApp/dist/build/mp-weixin/components/app-img.json
  39. 2 2
      hdApp/dist/build/mp-weixin/components/app-wrapper-empty.json
  40. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-order-list.json
  41. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-search.json
  42. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-share-mask.json
  43. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-vip.json
  44. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/alert.json
  45. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/fab.json
  46. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/list-cell.json
  47. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/modal.json
  48. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/rate.json
  49. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/selectList.json
  50. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/simple-address.json
  51. 0 0
      hdApp/dist/build/mp-weixin/pagesClient/official/apply.js
  52. 0 0
      hdApp/dist/build/mp-weixin/pagesClient/official/apply.wxml
  53. 1 1
      hdApp/dist/build/mp-weixin/pagesClient/official/apply.wxss
  54. 0 0
      hdApp/dist/build/mp-weixin/pagesClient/official/index.js
  55. 0 0
      hdApp/dist/build/mp-weixin/pagesClient/official/index.wxml
  56. 0 0
      hdApp/dist/build/mp-weixin/pagesClient/official/index.wxss
  57. 2 2
      hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
  58. 2 2
      hdApp/dist/build/mp-weixin/pagesPurchase/components/gatheringList.json
  59. 2 30
      hdApp/src/admin/staff/add.vue
  60. 1 1
      hdApp/src/pagesClient/official/index.vue

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

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

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/home/workbench.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/home/workbench.wxml


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/home/workbench.wxss


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/staff/add.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/staff/add.wxml


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

@@ -1 +1 @@
-.app-content.data-v-36231bf1{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-36231bf1{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-36231bf1{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-36231bf1{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-36231bf1{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-36231bf1{height:240rpx}.confirm-btn.data-v-36231bf1{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-36231bf1{width:100%}
+.app-content.data-v-138dfabc{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-138dfabc{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-138dfabc{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-138dfabc{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-138dfabc{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-138dfabc{height:240rpx}.confirm-btn.data-v-138dfabc{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-138dfabc{width:100%}

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-avatar.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-close.json

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/fab.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/modal.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/tabs.json

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

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesClient/official/apply.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesClient/official/apply.wxml


+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesClient/official/apply.wxss

@@ -1 +1 @@
-.module-com.data-v-45d1bd66{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-45d1bd66{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-45d1bd66{padding:0 30rpx}.line-cell .tui-title.data-v-45d1bd66{width:210rpx;color:#666}.line-cell .tui-input.data-v-45d1bd66{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-45d1bd66{color:#ccc}.line-cell .phcolor.data-v-45d1bd66{color:#ccc}.btn-wrap.data-v-45d1bd66{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-45d1bd66{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-45d1bd66{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-45d1bd66{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-45d1bd66{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-45d1bd66{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-45d1bd66{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}.recommend-wrap .recommend-det .recommend-info.data-v-45d1bd66{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-45d1bd66{margin-bottom:4rpx}
+.module-com.data-v-8e2083ba{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-8e2083ba{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-8e2083ba{padding:0 30rpx}.line-cell .tui-title.data-v-8e2083ba{width:210rpx;color:#666}.line-cell .tui-input.data-v-8e2083ba{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-8e2083ba{color:#ccc}.line-cell .phcolor.data-v-8e2083ba{color:#ccc}.btn-wrap.data-v-8e2083ba{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-8e2083ba{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-8e2083ba{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-8e2083ba{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-8e2083ba{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-8e2083ba{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-8e2083ba{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}.recommend-wrap .recommend-det .recommend-info.data-v-8e2083ba{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-8e2083ba{margin-bottom:4rpx}

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

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

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/info.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/info.wxml


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/info.wxss


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/order.js


+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesPurchase/order.wxml

@@ -1 +1 @@
-<view class="order-page data-v-0f42af47"><view class="tabs data-v-0f42af47"><tabs vue-id="74ac7040-1" isFixed="{{true}}" tabs="{{tabs}}" currentTab="{{tabIndex}}" itemWidth="20%" isAdd="{{false}}" addText="新增" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-0f42af47" bind:__l="__l"></tabs></view><scroll-view class="order-list data-v-0f42af47" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-0f42af47"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><order-item vue-id="{{'74ac7040-2-'+index}}" info="{{item}}" data-event-opts="{{[['^click',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" bind:click="__e" class="data-v-0f42af47" bind:__l="__l"></order-item></block></block></block><block wx:else><block class="data-v-0f42af47"><app-wrapper-empty vue-id="74ac7040-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-0f42af47" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn data-v-0f42af47"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-0f42af47" bindtap="__e">新增采购</view></view><kd-entrance vue-id="74ac7040-4" class="data-v-0f42af47" bind:__l="__l"></kd-entrance></view>
+<view class="order-page data-v-0bd21aec"><scroll-view class="order-list data-v-0bd21aec" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-0bd21aec"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><order-item vue-id="{{'74ac7040-1-'+index}}" info="{{item}}" data-event-opts="{{[['^click',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" bind:click="__e" class="data-v-0bd21aec" bind:__l="__l"></order-item></block></block></block><block wx:else><block class="data-v-0bd21aec"><app-wrapper-empty vue-id="74ac7040-2" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-0bd21aec" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn data-v-0bd21aec"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-0bd21aec" bindtap="__e">新增采购</view></view><kd-entrance vue-id="74ac7040-3" class="data-v-0bd21aec" bind:__l="__l"></kd-entrance></view>

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/order.wxss


+ 1 - 1
ghsApp/src/admin/home/workbench.vue

@@ -188,7 +188,7 @@ export default {
 					url: "/admin/billing/priceChange"
 				},
 				{
-					name: "采购",
+					name: "采购",
 					img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`,
 					url: "/pagesPurchase/order"
 				},

+ 2 - 32
ghsApp/src/admin/staff/add.vue

@@ -41,15 +41,6 @@
             </div>
           </tui-list-cell>
         </div>
-        <!-- 马上启用 -->
-        <div class="module-com input-line-wrap">
-          <tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
-            <div class="tui-title">启用状态</div>
-            <div>
-              <switch :checked="form.status == 0 ? false : true" @change="statusChangeFn" />
-            </div>
-          </tui-list-cell>
-        </div>
         <!-- 登录信息 -->
         <div class="module-com input-line-wrap">
           <tui-list-cell class="line-cell" :hover="false">
@@ -78,7 +69,7 @@
         </div>
         <!-- 提交 -->
         <div class="confirm-btn">
-          <button class="admin-button-com big blue" formType="submit">提交</button>
+          <button class="admin-button-com big blue" formType="submit">确认</button>
         </div>
       </form>
     </div>
@@ -115,11 +106,9 @@ export default {
     return {
       form: {
         name: "",
-        //mobile: '',
         roleId: "",
         remind: 1,
         password: "",
-        //userId: '',
         status: 1,
         remark: "",
       },
@@ -131,9 +120,7 @@ export default {
       memberData: {}
     };
   },
-  onLoad() {
-    // this.init()
-  },
+  onLoad() {},
   onShow() {
     if (this.option.id) {
       uni.setNavigationBarTitle({
@@ -180,9 +167,7 @@ export default {
       getDet({ id: this.option.id }).then(res => {
         if (this.$util.isEmpty(res.data)) return;
         Object.keys(this.form).forEach((i, index) => {
-          // if (i != 'password') {
           this.form[i] = res.data[i];
-          // }
         });
         this.roleSelData = this.roleList.filter(
           e => this.form.roleId == e.id
@@ -266,26 +251,11 @@ export default {
           rule: ["required"],
           msg: ["请输入姓名"]
         },
-        // {
-        // 	name: 'mobile',
-        // 	rule: ['required'],
-        // 	msg: ['请输入手机号']
-        // },
         {
           name: "roleId",
           rule: ["required"],
           msg: ["请选择角色"]
         }
-        // {
-        // 	name: 'userId',
-        // 	rule: ['required'],
-        // 	msg: ['请选择关联微信']
-        // }
-        // {
-        // 	name: 'password',
-        // 	rule: ['required'],
-        // 	msg: ['请输入密码']
-        // }
       ];
       // 进行表单检查
       let formData = e.detail.value;

+ 0 - 4
ghsApp/src/pagesPurchase/info.vue

@@ -46,10 +46,6 @@
 					<view>入库日期:</view>
 					<view>{{ detailInfo.entryTime }}</view>
 				</view>
-				<view class="order-info_box">
-					<view>欠款:</view>
-					<view>{{ detailInfo.debt==1?'是':'-' }}</view>
-				</view>
 				<view class="order-info_box">
 					<view>状态:</view>
 					<view>{{ 

+ 3 - 4
ghsApp/src/pagesPurchase/order.vue

@@ -1,8 +1,6 @@
 <template>
 	<view class="order-page">
-		<!-- @add="addEvent"
-				isAdd
-				addText="筛选" -->
+		<!--
 		<view class="tabs">
 			<Tabs
 				:isFixed="true"
@@ -15,6 +13,7 @@
 				addText="新增"
 			></Tabs>
 		</view>
+		-->
 		<scroll-view scroll-y class="order-list">
 			<block v-if="!$util.isEmpty(list.data)">
 				<OrderItem
@@ -182,7 +181,7 @@ export default {
 	flex-direction: column;
 	background-color: #f9fbfc;
 	.order-list {
-		padding-top: 80upx;
+		padding-top: 20upx;
 		flex: 1;
 		// padding-bottom: 50upx;
 		.allot-item {

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/module/operate.json

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

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/staff/add.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/staff/add.wxml


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

@@ -1 +1 @@
-.app-content.data-v-060a86c2{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-060a86c2{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-060a86c2{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-060a86c2{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-060a86c2{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-060a86c2{height:240rpx}.confirm-btn.data-v-060a86c2{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-060a86c2{width:100%}
+.app-content.data-v-5071e060{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-5071e060{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-5071e060{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-5071e060{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-5071e060{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-5071e060{height:240rpx}.confirm-btn.data-v-5071e060{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-5071e060{width:100%}

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-img.json

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-order-list.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-search.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-share-mask.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-vip.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/alert.json

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/list-cell.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/modal.json

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/selectList.json

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

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

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

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesClient/official/apply.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesClient/official/apply.wxml


+ 1 - 1
hdApp/dist/build/mp-weixin/pagesClient/official/apply.wxss

@@ -1 +1 @@
-.module-com.data-v-7aca4e07{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-7aca4e07{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-7aca4e07{padding:0 30rpx}.line-cell .tui-title.data-v-7aca4e07{width:210rpx;color:#666}.line-cell .tui-input.data-v-7aca4e07{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-7aca4e07{color:#ccc}.line-cell .phcolor.data-v-7aca4e07{color:#ccc}.btn-wrap.data-v-7aca4e07{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-7aca4e07{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-7aca4e07{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-7aca4e07{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-7aca4e07{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-7aca4e07{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-7aca4e07{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}.recommend-wrap .recommend-det .recommend-info.data-v-7aca4e07{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-7aca4e07{margin-bottom:4rpx}
+.module-com.data-v-3d53900c{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-3d53900c{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-3d53900c{padding:0 30rpx}.line-cell .tui-title.data-v-3d53900c{width:210rpx;color:#666}.line-cell .tui-input.data-v-3d53900c{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-3d53900c{color:#ccc}.line-cell .phcolor.data-v-3d53900c{color:#ccc}.btn-wrap.data-v-3d53900c{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-3d53900c{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-3d53900c{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-3d53900c{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-3d53900c{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-3d53900c{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-3d53900c{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}.recommend-wrap .recommend-det .recommend-info.data-v-3d53900c{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-3d53900c{margin-bottom:4rpx}

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesClient/official/index.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesClient/official/index.wxml


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesClient/official/index.wxss


+ 2 - 2
hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesPurchase/components/gatheringList.json

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

+ 2 - 30
hdApp/src/admin/staff/add.vue

@@ -42,15 +42,6 @@
             </div>
           </tui-list-cell>
         </div>
-        <!-- 马上启用 -->
-        <div class="module-com input-line-wrap">
-          <tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
-            <div class="tui-title">启用状态</div>
-            <div>
-              <switch :checked="form.status == 0 ? false : true" @change="statusChangeFn" />
-            </div>
-          </tui-list-cell>
-        </div>
         <!-- 登录信息 -->
         <div class="module-com input-line-wrap">
           <tui-list-cell class="line-cell" :hover="false">
@@ -79,7 +70,7 @@
         </div>
         <!-- 提交 -->
         <div class="confirm-btn">
-          <button class="admin-button-com big blue" formType="submit">提交</button>
+          <button class="admin-button-com big blue" formType="submit">确认</button>
         </div>
       </form>
     </div>
@@ -116,11 +107,9 @@ export default {
     return {
       form: {
         name: "",
-        //mobile: '',
         roleId: "",
         remind: 1,
         password: "",
-        //userId: '',
         status: 1,
         remark: "",
       },
@@ -132,9 +121,7 @@ export default {
       memberData: {}
     };
   },
-  onLoad() {
-    // this.init()
-  },
+  onLoad() {},
   onShow() {
     if (this.option.id) {
       uni.setNavigationBarTitle({
@@ -267,26 +254,11 @@ export default {
           rule: ["required"],
           msg: ["请输入姓名"]
         },
-        // {
-        // 	name: 'mobile',
-        // 	rule: ['required'],
-        // 	msg: ['请输入手机号']
-        // },
         {
           name: "roleId",
           rule: ["required"],
           msg: ["请选择角色"]
         }
-        // {
-        // 	name: 'userId',
-        // 	rule: ['required'],
-        // 	msg: ['请选择关联微信']
-        // }
-        // {
-        // 	name: 'password',
-        // 	rule: ['required'],
-        // 	msg: ['请输入密码']
-        // }
       ];
       // 进行表单检查
       let formData = e.detail.value;

+ 1 - 1
hdApp/src/pagesClient/official/index.vue

@@ -93,7 +93,7 @@ export default {
       contentData: [
         {
           title: `<span class="app-color-1">一键开通商城</span>`,
-          subTitle: `线上线下二个门店,店铺管理一个系统,商品节日自动调价,经营管理更方便`,
+          subTitle: `线上线下二个门店,店铺管理一个系统,经营管理更方便`,
           img: `${this.$constant.imgUrl}/retail/official/content-1.png`
         },
         {

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff