Merge branch 'zhongqi-hb' of git.huaml.com:zhh/front-end into zhongqi-hb

ghsApp/src/admin/custom/set.vue

@@ -4,7 +4,7 @@
 			<view class="module-com input-line-wrap">
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">新客享受价格</view>
+					<view class="tui-title">新客下单价格</view>
 					<view>
 						<button class="admin-button-com middle" :class="[form.isHd == 1 ? 'blue' : 'default']" @click="form.isHd = 1">批发价</button>
 						<button class="admin-button-com middle" :class="[form.isHd == 0 ? 'blue' : 'default']" @click="form.isHd = 0" style="margin-left:30upx;">零售价</button>
@@ -52,14 +52,13 @@
 						<button class="admin-button-com middle blue" @click="submitHomeDelivery">全部生效</button>
 					</tui-list-cell>
 				</view>
-				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">客户查看销量</view>
+				<!-- <tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title">新客查看销量</view>
 					<view>
 						<switch style="transform:scale(0.7,0.7)" :checked="form.showSold == 0 ? false : true" @change="showSoldChange" /> {{form.showSold==1 ? '可以' : '禁止'}}
 					</view>
 					<button class="admin-button-com middle blue" @click="allLookSale" style="margin-left:80upx;">已有客户生效</button>
-				</tui-list-cell>
-
+				</tui-list-cell> -->
 			</view>
 			<view class="confirm-btn">
 				<button class="admin-button-com big blue" formType="submit">提交修改</button>

ghsApp/src/pagesClient/member/detail.vue

@@ -166,32 +166,34 @@
               <div class="tui-title">充值记录</div>
             </tui-list-cell>
 
-            <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: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:2upx solid #CCCCCC;">
+              <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:14upx;margin-right:14upx;">批发价</button>
+                <button class="admin-button-com middle" :class="[form.level == 2 ? 'blue' : 'default']" @click="changeLevelBtn(2)">大客价</button>
+              </tui-list-cell>
 
-            <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
-              <view class="tui-title">涨价比例</view>
-              <view style="display:flex;align-items:center;">
-                <input v-model="userInfo.risePercent" @click="userInfo.risePercent=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不涨填0" type="number" style="width:248upx;border:1upx solid #ddd;margin-right:10upx;height:70upx;text-align:center;" />
-                <text style="margin-right:30upx;">%</text>
-              </view>
-              <button class="admin-button-com blue middle" @tap="changeRise">确定</button>
-            </tui-list-cell>
+              <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
+                <view class="tui-title">涨价比例</view>
+                <view style="display:flex;align-items:center;">
+                  <input v-model="userInfo.risePercent" @click="userInfo.risePercent=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不涨填0" type="number" style="width:248upx;border:1upx solid #ddd;margin-right:10upx;height:70upx;text-align:center;" />
+                  <text style="margin-right:30upx;">%</text>
+                </view>
+                <button class="admin-button-com blue middle" @tap="changeRise">确定</button>
+              </tui-list-cell>
 
-            <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
-              <view class="tui-title">最高涨价</view>
-              <view style="display:flex;align-items:center;">
-                <input v-model="userInfo.riseRange" @click="userInfo.riseRange=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="number" style="width:248upx;border:1upx solid #ddd;margin-right:10upx;height:70upx;text-align:center;" />
-                <text style="margin-right:30upx;">元</text>
-              </view>
-              <button class="admin-button-com blue middle" @tap="changeRise">确定</button>
-            </tui-list-cell>
+              <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
+                <view class="tui-title">最高涨幅</view>
+                <view style="display:flex;align-items:center;">
+                  <input v-model="userInfo.riseRange" @click="userInfo.riseRange=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="number" style="width:248upx;border:1upx solid #ddd;margin-right:10upx;height:70upx;text-align:center;" />
+                  <text style="margin-right:30upx;">元</text>
+                </view>
+                <button class="admin-button-com blue middle" @tap="changeRise">确定</button>
+              </tui-list-cell>
+            </view>
 
-            <view style="border:2upx solid #CCCCCC;">
+            <view style="border:2upx solid #CCCCCC;margin-top:20upx;">
               <tui-list-cell class="line-cell" :hover="false">
                 <div class="tui-title">送货上门</div>
                 <div class="switch_bx">
@@ -200,7 +202,6 @@
                   <switch :checked="form.home == 0 ? false : true" @change="homeChangeFn" style="transform: scale(0.8,0.8)" />
                 </div>
               </tui-list-cell>
-
               <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
                 <div class="tui-title">最低消费金额</div>
                 <input v-model="userInfo.homeAmount" @click="userInfo.homeAmount=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="digit" style="width:280upx;border:1upx solid #ddd;margin-right:30upx;height:70upx;text-align:center;" />
@@ -240,7 +241,7 @@
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">删除客户</div>
+              <div class="tui-title">删除状态</div>
               <div class="switch_bx">
                 <text v-if="form.delStatus == 1">已删</text>
                 <text v-else>正常</text>
@@ -273,7 +274,7 @@
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">欠款超额后</div>
+              <div class="tui-title">挂账超额后</div>
               <button class="admin-button-com middle" :class="[form.debtLimitPay == 0 ? 'blue' : 'default']" @click="debtLimitPayBtn(0)">现金可下单</button>
               <button class="admin-button-com middle" :class="[form.debtLimitPay == 1 ? 'blue' : 'default']" @click="debtLimitPayBtn(1)" style="margin-left:15upx;">现金不能下单</button>
             </tui-list-cell>

hdApp/src/admin/home/workbench.vue

@@ -1216,7 +1216,7 @@ export default {
           }
           
           .bubble-value {
-            font-size: 44upx;
+            font-size: 34upx;
             font-weight: 800;
             color: #ffffff;
             line-height: 1;