shish 8 месяцев назад
Родитель
Сommit
1ebf2dc048
4 измененных файлов с 16 добавлено и 12 удалено
  1. 4 3
      ghsApp/src/admin/home/me.vue
  2. 5 3
      ghsApp/src/admin/shop/sk.vue
  3. 3 4
      hdApp/src/admin/home/me.vue
  4. 4 2
      hdApp/src/admin/shop/sk.vue

+ 4 - 3
ghsApp/src/admin/home/me.vue

@@ -152,9 +152,6 @@
               <view class="tui-title">密码修改</view>
               <view class="tui-title">密码修改</view>
             </tui-list-cell>
             </tui-list-cell>
 
 
-            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">跑腿设置</view>
-            </tui-list-cell>
 
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">接单小票机</view>
               <view class="tui-title">接单小票机</view>
@@ -168,6 +165,10 @@
               <view class="tui-title">云音箱</view>
               <view class="tui-title">云音箱</view>
             </tui-list-cell>
             </tui-list-cell>
 
 
+            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true">
+              <view class="tui-title">跑腿设置</view>
+            </tui-list-cell>
+
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">更多设置</view>
               <view class="tui-title">更多设置</view>
             </tui-list-cell>
             </tui-list-cell>

+ 5 - 3
ghsApp/src/admin/shop/sk.vue

@@ -17,6 +17,8 @@
             <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">
           <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">
             <radio-group class="tui-input" @change="orderFlowChange">
@@ -30,7 +32,7 @@
               </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="thirdSendChange">
             <radio-group class="tui-input" @change="thirdSendChange">
@@ -50,11 +52,11 @@
             <radio-group class="tui-input" @change="thirdSendFeeChange">
             <radio-group class="tui-input" @change="thirdSendFeeChange">
               <label class="list" for="thirdSendFeeDf">
               <label class="list" for="thirdSendFeeDf">
                 <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">
                 <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>
               </label>
             </radio-group>
             </radio-group>
           </tui-list-cell>
           </tui-list-cell>

+ 3 - 4
hdApp/src/admin/home/me.vue

@@ -79,10 +79,6 @@
               <view class="tui-title">密码修改</view>
               <view class="tui-title">密码修改</view>
             </tui-list-cell>
             </tui-list-cell>
 
 
-            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true" >
-              <view class="tui-title">跑腿设置</view>
-            </tui-list-cell>
-
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">前台小票机</view>
               <view class="tui-title">前台小票机</view>
             </tui-list-cell>
             </tui-list-cell>
@@ -104,6 +100,9 @@
               <view class="tui-title">美团云音箱</view>
               <view class="tui-title">美团云音箱</view>
             </tui-list-cell>
             </tui-list-cell>
 
 
+            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true" >
+              <view class="tui-title">跑腿设置</view>
+            </tui-list-cell>
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">更多设置</view>
               <view class="tui-title">更多设置</view>
             </tui-list-cell>
             </tui-list-cell>

+ 4 - 2
hdApp/src/admin/shop/sk.vue

@@ -29,6 +29,8 @@
             </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">
           <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">
             <radio-group class="tui-input" @change="orderFlowChange">
@@ -62,11 +64,11 @@
             <radio-group class="tui-input" @change="thirdSendFeeChange">
             <radio-group class="tui-input" @change="thirdSendFeeChange">
               <label class="list" for="thirdSendFeeDf">
               <label class="list" for="thirdSendFeeDf">
                 <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">
                 <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>
               </label>
             </radio-group>
             </radio-group>
           </tui-list-cell>
           </tui-list-cell>