优化

ghsApp/src/admin/shop/sk.vue

@@ -17,16 +17,30 @@
             <view>{{zjGatheringItemName}}</view>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">下单后</view>
+            <radio-group class="tui-input" @change="orderFlowChange">
+              <label class="list" for="orderFlowZj">
+                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">直接完成</span>
+              </label>
+              <label class="list" for="orderFlowFh">
+                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">需要发货</span>
+              </label>
+            </radio-group>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">商城端跑腿</view>
             <radio-group class="tui-input" @change="thirdSendChange">
               <label class="list" for="thirdSendOk">
                 <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">支持</span>
+                <span class="checkbox-text">允许</span>
               </label>
               <label class="list" for="thirdSendNo">
                 <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">不支持</span>
+                <span class="checkbox-text">不允许</span>
               </label>
             </radio-group>
           </tui-list-cell>
@@ -36,33 +50,11 @@
             <radio-group class="tui-input" @change="thirdSendFeeChange">
               <label class="list" for="thirdSendFeeDf">
                 <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">到付</span>
+                <span class="checkbox-text">自理</span>
               </label>
               <label class="list" for="thirdSendFeeZd">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">自动计算</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false" v-if="thirdSendFee == 1">
-            <view class="tui-title">自动计算</view>
-            <view>
-              <text v-if="wxStoreId!=''" style="color:#3385FF;font-weight:bold;">已开启</text>
-              <text v-else style="color:red;font-weight:bold;">未开启</text>
-            </view>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单后</view>
-            <radio-group class="tui-input" @change="orderFlowChange">
-              <label class="list" for="orderFlowZj">
-                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">直接完成</span>
-              </label>
-              <label class="list" for="orderFlowFh">
-                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">需要发货</span>
+                <span class="checkbox-text">预收</span>
               </label>
             </radio-group>
           </tui-list-cell>
@@ -148,7 +140,6 @@ export default {
       zjGatheringItem:0,
       zjGatheringItemName:'',
       selectItemOk:0,
-      wxStoreId:'',
       // 花材批发和零售配置
       flowerMaterials: [{num:0,price:0,distance:0}],
       // 花束配置
@@ -248,12 +239,8 @@ export default {
           this.orderFlow = res.data.orderFlow
           this.thirdSend = res.data.thirdSend
           this.thirdSendFee = res.data.thirdSendFee
-          let main = res.data.main?res.data.main:[]
-          this.wxStoreId = main.wxStoreId
           // 加载花材批发和零售配置
           this.flowerMaterials = res.data.hcMap ? JSON.parse(res.data.hcMap) : [{num:0,price:0,distance:0}]
-          console.log(this.flowerMaterials)
-          console.log(typeof this.flowerMaterials)
           this.hcFreeKm = res.data.hcFreeKm ? res.data.hcFreeKm : 0
           this.hsFreeKm = res.data.hsFreeKm ? res.data.hsFreeKm : 0
           this.hsAddFee = res.data.hsAddFee ? res.data.hsAddFee : 0

hdApp/src/admin/shop/sk.vue

@@ -30,15 +30,29 @@
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">商城端跑腿</view>
+            <view class="tui-title">下单后</view>
+            <radio-group class="tui-input" @change="orderFlowChange">
+              <label class="list" for="orderFlowZj">
+                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">直接完成</span>
+              </label>
+              <label class="list" for="orderFlowFh">
+                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">需要发货</span>
+              </label>
+            </radio-group>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">跑腿下单</view>
             <radio-group class="tui-input" @change="thirdSendChange">
               <label class="list" for="thirdSendOk">
                 <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">支持</span>
+                <span class="checkbox-text">允许</span>
               </label>
               <label class="list" for="thirdSendNo">
                 <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">不支持</span>
+                <span class="checkbox-text">不允许</span>
               </label>
             </radio-group>
           </tui-list-cell>
@@ -48,33 +62,11 @@
             <radio-group class="tui-input" @change="thirdSendFeeChange">
               <label class="list" for="thirdSendFeeDf">
                 <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">到付</span>
+                <span class="checkbox-text">自理</span>
               </label>
               <label class="list" for="thirdSendFeeZd">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">自动计算</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false" v-if="thirdSendFee == 1">
-            <view class="tui-title">自动计算</view>
-            <view>
-              <text v-if="wxStoreId!=''" style="color:#3385FF;font-weight:bold;">已开启</text>
-              <text v-else style="color:red;font-weight:bold;">未开启</text>
-            </view>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单后</view>
-            <radio-group class="tui-input" @change="orderFlowChange">
-              <label class="list" for="orderFlowZj">
-                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">直接完成</span>
-              </label>
-              <label class="list" for="orderFlowFh">
-                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">需要发货</span>
+                <span class="checkbox-text">预收</span>
               </label>
             </radio-group>
           </tui-list-cell>
@@ -161,7 +153,6 @@ export default {
       orderFlow:0,
       thirdSend:0,
       thirdSendFee:0,
-      wxStoreId:'',
       needWork:0,
       // 花材批发和零售配置
       flowerMaterials: [{num:0,price:0,distance:0}],
@@ -242,12 +233,8 @@ export default {
           this.thirdSend = res.data.thirdSend
           this.thirdSendFee = res.data.thirdSendFee
           this.needWork = res.data.needWork
-          let main = res.data.main?res.data.main:[]
-          this.wxStoreId = main.wxStoreId
           // 加载花材批发和零售配置
           this.flowerMaterials = res.data.hcMap ? JSON.parse(res.data.hcMap) : [{num:0,price:0,distance:0}]
-          console.log(this.flowerMaterials)
-          console.log(typeof this.flowerMaterials)
           this.hcFreeKm = res.data.hcFreeKm ? res.data.hcFreeKm : 0
           this.hsFreeKm = res.data.hsFreeKm ? res.data.hsFreeKm : 0
           this.hsAddFee = res.data.hsAddFee ? res.data.hsAddFee : 0

mallApp/src/pages/home/recent.vue

@@ -155,7 +155,7 @@
 
             <!-- 操作按钮组 -->
             <view class="action-buttons">
-              <view class="action-btn primary" @click.stop="bug(item)">
+              <view class="action-btn secondary" @click.stop="bug(item)">
                 <text class="btn-text">🌸 花材</text>
               </view>
               <view class="action-btn secondary" @click.stop="hs(item)">