开单优化

ghsApp/src/admin/billing/affirm.vue

@@ -166,6 +166,16 @@
                 </picker>
               </tui-list-cell>
 
+              <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 0">
+                <view class="tui-title">待付款</view>
+                <view class="tui-input" style="color:#3385ff;">扫码付款、微信邀请付款 选待付款</view>
+              </tui-list-cell>
+
+              <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 2">
+                <view class="tui-title">赊账</view>
+                <view class="tui-input" style="color:#3385ff;">客户要欠款挂账的 选赊账</view>
+              </tui-list-cell>
+
               <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="displayPackCost == true">
                 <view class="tui-title">打包费</view>
                 <input type="digit" placeholder="请填写打包费" v-model="form.packCost" placeholder-class="tui-placeholder" />
@@ -324,10 +334,10 @@
                   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                     <view class="tui-title">运费</view>
                     <view v-if="form.reductionRule == 1 && isHcMapRule()">
-                      <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:300upx;height:70upx;text-align:center;"/>
+                      <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:320upx;height:70upx;text-align:center;"/>
                     </view>
                     <view v-else>
-                      <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:300upx;height:70upx;text-align:center;"/>
+                      <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:320upx;height:70upx;text-align:center;"/>
                     </view>
                   </tui-list-cell>
                   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -395,11 +405,9 @@
               </tui-list-cell>
 
               <tui-list-cell class="line-cell" :hover="false" :arrow="true">
-                <view class="tui-title">送货日期</view>
-                <view class="uni-input" v-if="form.sendTimeWant == ''" style="color: #cccccc; width: 400upx; font-size: 34upx" @click="bindDateChange"
-                  >默认当天</view
-                >
-                <view class="uni-input" @click="bindDateChange" v-else style="width: 400upx; font-size: 34upx">{{ form.sendTimeWant }}</view>
+                <view class="tui-title">账单日期</view>
+                <view class="uni-input" v-if="form.historyDate == ''" style="color: #cccccc; width: 400upx; font-size: 34upx" @click="bindHistoryDateChange" >默认当天</view >
+                <view class="uni-input" @click="bindHistoryDateChange" v-else style="width: 400upx; font-size: 34upx">{{ form.historyDate }}</view>
               </tui-list-cell>
 
               <tui-list-cell class="line-cell" :arrow="true">
@@ -412,81 +420,10 @@
                 }}</view>
               </tui-list-cell>
 
-              <uni-popup ref="staffRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
-                <view style="max-height: 80vh; overflow: scroll">
-                  <view style="margin-left: 30upx; margin-top: 19upx; font-size: 27upx; font-weight: bold">请选择：</view>
-                  <view
-                    style="
-                      display: flex;
-                      padding: 20upx;
-                      height: auto;
-                      justify-content: flex-start;
-                      align-items: center;
-                      flex-wrap: wrap;
-                      max-height: 100vh;
-                      overflow: auto;
-                    "
-                  >
-                    <view v-for="(item, index) in staffList" :key="index" style="margin-bottom: 20upx; margin-left: 3upx">
-                      <button
-                        class="admin-button-com staff-btn"
-                        @click.stop="getCurrentStaff(item)"
-                        :class="{ selected: form.getStaffId === item.id }"
-                      >
-                        {{ item.name }}
-                      </button>
-                    </view>
-                  </view>
-                  <view style="text-align: center; padding: 10upx 0 10upx 0"
-                    ><button class="admin-button-com big blue" @click="cancelCurrentStaff()">取消</button></view
-                  >
-                </view>
-              </uni-popup>
-
-              <uni-popup ref="wlRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
-                <view style="max-height: 80vh; overflow: scroll">
-                  <view style="margin-left: 30upx; margin-top: 19upx; font-size: 27upx; font-weight: bold">请选择物流：</view>
-                  <view
-                    style="
-                      display: flex;
-                      padding: 20upx;
-                      height: auto;
-                      justify-content: flex-start;
-                      align-items: center;
-                      flex-wrap: wrap;
-                      max-height: 100vh;
-                      overflow: auto;
-                    "
-                  >
-                    <view v-for="(item, index) in wlList" :key="index" style="margin-bottom: 20upx; margin-left: 3upx">
-                      <button
-                        class="admin-button-com staff-btn"
-                        @click.stop="selectWl(item)"
-                        :class="{ selected: form.wlName === item.name }"
-                      >
-                        {{ item.name }}
-                      </button>
-                    </view>
-                  </view>
-                  <view style="text-align: center; padding: 10upx 0 10upx 0"
-                    >
-<button class="admin-button-com big blue" @click="addWlItem()">新增</button>
-<button class="admin-button-com big blue" @click="cancelWlSelect()">取消</button>
-</view
-                  >
-                </view>
-              </uni-popup>
-
               <tui-list-cell class="line-cell" :hover="false" :arrow="true">
-                <view class="tui-title">账单日期</view>
-                <view
-                  class="uni-input"
-                  v-if="form.historyDate == ''"
-                  style="color: #cccccc; width: 400upx; font-size: 34upx"
-                  @click="bindHistoryDateChange"
-                  >默认当天</view
-                >
-                <view class="uni-input" @click="bindHistoryDateChange" v-else style="width: 400upx; font-size: 34upx">{{ form.historyDate }}</view>
+                <view class="tui-title">送货日期</view>
+                <view class="uni-input" v-if="form.sendTimeWant == ''" style="color: #cccccc; width: 400upx; font-size: 34upx" @click="bindDateChange" >默认当天</view >
+                <view class="uni-input" @click="bindDateChange" v-else style="width: 400upx; font-size: 34upx">{{ form.sendTimeWant }}</view>
               </tui-list-cell>
 
               <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -503,14 +440,11 @@
           <text class="price-title">
             <text></text>
           </text>
-          <text class="price-number"
-            ><text class="large">¥{{ modifyPrice }}</text></text
-          >
+          <text class="price-number"><text class="large">¥{{ modifyPrice }}</text></text>
         </view>
         <text style="font-size: 30upx; right: 100upx">
           当前在
-          <text style="font-weight: bold; color: red; margin-left: 5upx; font-size: 32upx">{{ currentShop.shopName }}</text></text
-        >
+          <text style="font-weight: bold; color: red; margin-left: 5upx; font-size: 32upx">{{ currentShop.shopName }}</text></text>
         <button class="admin-button-com blue big" @click="confirmSubmit">提交</button>
       </view>
 
@@ -586,6 +520,65 @@
         </view>
       </uni-popup>
 
+      <uni-popup ref="staffRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+        <view style="max-height: 80vh; overflow: scroll">
+          <view style="margin-left: 30upx; margin-top: 19upx; font-size: 27upx; font-weight: bold">请选择：</view>
+          <view
+            style="
+              display: flex;
+              padding: 20upx;
+              height: auto;
+              justify-content: flex-start;
+              align-items: center;
+              flex-wrap: wrap;
+              max-height: 100vh;
+              overflow: auto;
+            "
+          >
+            <view v-for="(item, index) in staffList" :key="index" style="margin-bottom: 20upx; margin-left: 3upx">
+              <button class="admin-button-com staff-btn" @click.stop="getCurrentStaff(item)" :class="{ selected: form.getStaffId === item.id }" >
+                {{ item.name }}
+              </button>
+            </view>
+          </view>
+          <view style="text-align: center; padding: 10upx 0 10upx 0">
+            <button class="admin-button-com big blue" @click="cancelCurrentStaff()">取消</button>
+          </view>
+        </view>
+      </uni-popup>
+
+      <uni-popup ref="wlRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+        <view style="max-height: 80vh; overflow: scroll">
+          <view style="margin-left: 30upx; margin-top: 19upx; font-size: 27upx; font-weight: bold">请选择物流：</view>
+          <view
+            style="
+              display: flex;
+              padding: 20upx;
+              height: auto;
+              justify-content: flex-start;
+              align-items: center;
+              flex-wrap: wrap;
+              max-height: 100vh;
+              overflow: auto;
+            "
+          >
+            <view v-for="(item, index) in wlList" :key="index" style="margin-bottom: 20upx; margin-left: 3upx">
+              <button
+                class="admin-button-com staff-btn"
+                @click.stop="selectWl(item)"
+                :class="{ selected: form.wlName === item.name }"
+              >
+                {{ item.name }}
+              </button>
+            </view>
+          </view>
+          <view style="text-align: center; padding: 10upx 0 10upx 0">
+            <button class="admin-button-com big blue" @click="addWlItem()">新增</button>
+            <button class="admin-button-com big blue" @click="cancelWlSelect()">取消</button>
+          </view>
+        </view>
+      </uni-popup>
+
       <!-- 蒙板 -->
       <view v-if="showPicker" class="date-picker-mask" @click="showPicker = false"></view>
 

ghsApp/src/pagesClient/member/detail.vue

@@ -167,11 +167,11 @@
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">享受价格</div>
               <button class="admin-button-com middle" :class="[form.level == 0 ? 'blue' : 'default']" @click="changeLevelBtn(0)">零售价</button>
-              <button class="admin-button-com middle" :class="[form.level == 1 ? 'blue' : 'default']" @click="changeLevelBtn(1)" style="margin-left:15upx;margin-right:15upx;">批发价</button>
+              <button class="admin-button-com middle" :class="[form.level == 1 ? 'blue' : 'default']" @click="changeLevelBtn(1)" style="margin-left:18upx;margin-right:18upx;">批发价</button>
               <button class="admin-button-com middle" :class="[form.level == 2 ? 'blue' : 'default']" @click="changeLevelBtn(2)">大客价</button>
             </tui-list-cell>
 
-            <view style="border:1upx solid #CCCCCC;">
+            <view style="border:2upx solid #CCCCCC;">
               <tui-list-cell class="line-cell" :hover="false">
                 <div class="tui-title">送货上门</div>
                 <div class="switch_bx">