shish 8 сар өмнө
parent
commit
b679045ebb

+ 22 - 24
ghsApp/src/admin/shop/sk.vue

@@ -17,46 +17,44 @@
             <view>{{zjGatheringItemName}}</view>
             <view>{{zjGatheringItemName}}</view>
           </tui-list-cell>
           </tui-list-cell>
 
 
-          <view style="background-color: white;text-align:right;font-size:32upx;padding:14upx 20upx 14upx 0;color:#bfa6a6;">如果需要一键发跑腿,请选需要发货</view>
-
-          <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">
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单选跑腿</view>
+            <view class="tui-title">客户下单</view>
             <radio-group class="tui-input" @change="thirdSendChange">
             <radio-group class="tui-input" @change="thirdSendChange">
               <label class="list" for="thirdSendOk">
               <label class="list" for="thirdSendOk">
                 <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
                 <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>
               <label class="list" for="thirdSendNo">
               <label class="list" for="thirdSendNo">
                 <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
                 <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>
               </label>
             </radio-group>
             </radio-group>
           </tui-list-cell>
           </tui-list-cell>
 
 
           <tui-list-cell class="line-cell" :hover="false">
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">跑腿费用</view>
             <view class="tui-title">跑腿费用</view>
-            <radio-group class="tui-input" @change="thirdSendFeeChange">
-              <label class="list" for="thirdSendFeeDf">
+            <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+              <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
                 <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>
-              <label class="list" for="thirdSendFeeZd">
+              <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">提前收取</span>
+                <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="orderFlowChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+              <label class="list" for="orderFlowZj" style="display: flex; align-items: center; white-space: nowrap;">
+                <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" style="display: flex; align-items: center; white-space: nowrap;">
+                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">有发跑腿,不要完成</span>
               </label>
               </label>
             </radio-group>
             </radio-group>
           </tui-list-cell>
           </tui-list-cell>

+ 22 - 24
hdApp/src/admin/shop/sk.vue

@@ -29,46 +29,44 @@
             </radio-group>
             </radio-group>
           </tui-list-cell>
           </tui-list-cell>
 
 
-          <view style="background-color: white;text-align:right;font-size:32upx;padding:14upx 20upx 14upx 0;color:#bfa6a6;">如果需要一键发跑腿,请选需要发货</view>
-
-          <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">
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单选跑腿</view>
+            <view class="tui-title">客户下单</view>
             <radio-group class="tui-input" @change="thirdSendChange">
             <radio-group class="tui-input" @change="thirdSendChange">
               <label class="list" for="thirdSendOk">
               <label class="list" for="thirdSendOk">
                 <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
                 <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>
               <label class="list" for="thirdSendNo">
               <label class="list" for="thirdSendNo">
                 <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
                 <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>
               </label>
             </radio-group>
             </radio-group>
           </tui-list-cell>
           </tui-list-cell>
 
 
           <tui-list-cell class="line-cell" :hover="false">
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">跑腿费用</view>
             <view class="tui-title">跑腿费用</view>
-            <radio-group class="tui-input" @change="thirdSendFeeChange">
-              <label class="list" for="thirdSendFeeDf">
+            <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+              <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
                 <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>
-              <label class="list" for="thirdSendFeeZd">
+              <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">提前收取</span>
+                <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="orderFlowChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+              <label class="list" for="orderFlowZj" style="display: flex; align-items: center; white-space: nowrap;">
+                <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" style="display: flex; align-items: center; white-space: nowrap;">
+                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">有发跑腿,不要完成</span>
               </label>
               </label>
             </radio-group>
             </radio-group>
           </tui-list-cell>
           </tui-list-cell>