cr лет назад: 4
Родитель
Сommit
342d6562b2
5 измененных файлов с 71 добавлено и 25 удалено
  1. 5 0
      releaselog.md
  2. 24 10
      src/pages/guide/delivery.vue
  3. 4 3
      src/pages/guide/form.vue
  4. 26 0
      src/pages/index/register.vue
  5. 12 12
      src/pages/manage/index.vue

+ 5 - 0
releaselog.md

@@ -1,4 +1,9 @@
1 1
 
2
+
3
+# 0.4.9 (21.03.12 12:00) 
4
+### 增加开店
5
+
6
+
2 7
 # 0.4.7 (21.03.3 18:00) 
3 8
 ### 增加群助理
4 9
 

+ 24 - 10
src/pages/guide/delivery.vue

@@ -11,8 +11,8 @@
11 11
             ></uni-steps>
12 12
         </div>
13 13
         <div class="form-card">
14
-            <section class="form-item">
15
-                <div class="label">到店自提设置</div>
14
+            <section class="form-item dis">
15
+                <div class="label">到店自提设置</div>
16 16
                 <div class="box"></div>
17 17
             </section>
18 18
             <section class="form-item">
@@ -28,13 +28,13 @@
28 28
             <section class="form-item" v-if="form.deliveryMethod.storePickUp">
29 29
                 <div class="label">最低自提下单金额:</div>
30 30
                 <div class="box">
31
-                    <input type="number" v-model="form.pickupMinAmount" />
31
+                    <input type="number" v-model="form.pickupMinAmount" placeholder="元"/>
32 32
                 </div>
33
-                <div class="tool">元</div>
33
+                <!-- <div class="tool">元</div> -->
34 34
             </section>
35 35
 
36
-            <section class="form-item">
37
-                <div class="label">送货上门设置</div>
36
+            <section class="form-item dis">
37
+                <div class="label">送货上门设置 </div>
38 38
                 <div class="box"></div>
39 39
             </section>
40 40
             <section class="form-item">
@@ -57,9 +57,10 @@
57 57
                         <input
58 58
                             type="number"
59 59
                             v-model="form.deliveryMinAmount"
60
+                            placeholder="元"
60 61
                         />
61 62
                     </div>
62
-                    <div class="tool">元</div>
63
+                    <!-- <div class="tool">元</div> -->
63 64
                 </section>
64 65
                 <section class="form-item">
65 66
                     <div class="label">
@@ -70,9 +71,11 @@
70 71
                         <input
71 72
                             type="number"
72 73
                             v-model="form.deliveryDistance"
74
+                            placeholder="公里"
73 75
                         />
76
+                        <span class="input-tip">距离门店步行距离</span>
74 77
                     </div>
75
-                    <div class="tool">公里</div>
78
+                    <!-- <div class="tool">公里</div> -->
76 79
                 </section>
77 80
                 <section class="form-item">
78 81
                     <div class="label">
@@ -83,9 +86,11 @@
83 86
                         <input
84 87
                             type="digit"
85 88
                             v-model="form.deliveryFee"
89
+                            placeholder="元"
86 90
                         />
91
+                        <span class="input-tip">按单收取配送费</span>
87 92
                     </div>
88
-                    <div class="tool">元</div>
93
+                    <!-- <div class="tool">元</div> -->
89 94
                 </section>
90 95
                 <section class="form-item">
91 96
                     <div class="label">
@@ -96,9 +101,11 @@
96 101
                         <input
97 102
                             type="digit"
98 103
                             v-model="form.packageFee"
104
+                            placeholder="元"
99 105
                         />
106
+                        <span class="input-tip">按单收取打包费</span>
100 107
                     </div>
101
-                    <div class="tool">元</div>
108
+                    <!-- <div class="tool">元</div> -->
102 109
                 </section>
103 110
             </block>
104 111
         </div>
@@ -276,6 +283,13 @@ export default {
276 283
     .box {
277 284
         width: 100%;
278 285
         position: relative;
286
+        display: flex;
287
+        align-items: center;
288
+        .input-tip{
289
+            flex-shrink: 0;
290
+            font-size: px(42);
291
+            color: #666;
292
+        }
279 293
         input {
280 294
             width: 100%;
281 295
         }

+ 4 - 3
src/pages/guide/form.vue

@@ -80,6 +80,7 @@
80 80
                         :types="'image'"
81 81
                         v-model="mainImage"
82 82
                         :uploadCount="1"
83
+                        :openCilp="true"
83 84
                         @change="minImgChange"
84 85
                     ></easy-upload>
85 86
                 </div>
@@ -134,11 +135,11 @@ export default {
134 135
             form: {
135 136
                 appNmae:'',
136 137
                 managerTelephone:'',
137
-                startTime:'',
138
-                endTime:'',
138
+                startTime:'8:00',
139
+                endTime:'22:00',
139 140
                 logo:'',
140 141
                 shopBanner:'',
141
-                shopNotice:'',
142
+                shopNotice:'开通本店',
142 143
             },
143 144
             mainImage: [],
144 145
             mainImage2: [],

+ 26 - 0
src/pages/index/register.vue

@@ -385,6 +385,32 @@ export default {
385 385
                 pid: this.form.teamNum,
386 386
                 platform: this.form.fromPlatform,
387 387
             };
388
+            this.api
389
+                .get("/Group/GetGroupInfo", sendData, { pass: true })
390
+                .then((res) => {
391
+                    if (res.success) {
392
+                        this.fn
393
+                            .showModal({
394
+                                title: "团长信息",
395
+                                content: `当前团长为${res.data.accountName},是否确认提交`,
396
+                            })
397
+                            .then((res) => {
398
+                                if (res.confirm) {
399
+                                    this.commitPid(sendData);
400
+                                } else {
401
+                                }
402
+                            });
403
+                    } else {
404
+                        this.fn.showModal({
405
+                            title: "获取团长信息失败",
406
+                            content: res.message,
407
+                            showCancel: false,
408
+                        });
409
+                    }
410
+                });
411
+        },
412
+
413
+        commitPid(sendData) {
388 414
             this.api
389 415
                 .post("/Group/CommitPid", sendData, { pass: true })
390 416
                 .then((res) => {

+ 12 - 12
src/pages/manage/index.vue

@@ -38,7 +38,7 @@
38 38
                         <my-image class="img" :src="item.icon"></my-image>
39 39
                         <span class="text">{{ item.name }}</span>
40 40
                     </li>
41
-                    <block v-if="storeStatus === 0 || storeStatus === 1">
41
+                    <!-- <block v-if="storeStatus === 0 || storeStatus === 1">
42 42
                         <li
43 43
                             class="item"
44 44
                             @click="jump('/pages/manage/shop/index')"
@@ -56,7 +56,7 @@
56 56
                             src="/static/icon/money.png"
57 57
                         ></my-image>
58 58
                         <span class="text">我的钱包</span>
59
-                    </li>
59
+                    </li> -->
60 60
                     <li class="item" @click="jump('/pages/manage/user/index')">
61 61
                         <my-image
62 62
                             class="img"
@@ -67,7 +67,7 @@
67 67
                 </ul>
68 68
             </block>
69 69
             <ul class="menu" v-if="!showMenu">
70
-                <block v-if="storeStatus === 0 || storeStatus === 1">
70
+                <!-- <block v-if="storeStatus === 0 || storeStatus === 1">
71 71
                     <li class="item" @click="jump('/pages/manage/shop/index')">
72 72
                         <my-image
73 73
                             class="img"
@@ -76,13 +76,13 @@
76 76
                         <span class="text">店铺设置</span>
77 77
                     </li>
78 78
                 </block>
79
-                    <li class="item" @click="jump('/pages/wallet/index')">
80
-                        <my-image
81
-                            class="img"
82
-                            src="/static/icon/money.png"
83
-                        ></my-image>
84
-                        <span class="text">我的钱包</span>
85
-                    </li>
79
+                <li class="item" @click="jump('/pages/wallet/index')">
80
+                    <my-image
81
+                        class="img"
82
+                        src="/static/icon/money.png"
83
+                    ></my-image>
84
+                    <span class="text">我的钱包</span>
85
+                </li> -->
86 86
                 <li class="item" @click="jump('/pages/manage/user/index')">
87 87
                     <my-image
88 88
                         class="img"
@@ -95,7 +95,7 @@
95 95
 
96 96
         <!-- <button class="btn" @click="layout">退出登录</button> -->
97 97
 
98
-        <div class="ver">0.4.8</div>
98
+        <div class="ver">0.4.9</div>
99 99
         <wyg-bottom-tab
100 100
             ref="tabbar"
101 101
             :tabIndex="2"
@@ -159,7 +159,7 @@ export default {
159 159
         }
160 160
         this.getUserMenu();
161 161
         this.$refs.tabbar.setIndex(2);
162
-        this.checkStatus();
162
+        // this.checkStatus();
163 163
     },
164 164
     // 函数
165 165
     methods: {