电子手册 和 采购模式

ghsApp/src/admin/cg/set.vue

@@ -5,13 +5,24 @@
         <div class="module-com input-line-wrap">
 
           <tui-list-cell class="line-cell" :arrow="false">
-            <div class="tui-title">简约模式：</div>
-            <switch style="transform: scale(0.8,0.8)" :checked="cgModel == 0 ? false : true" @change="cgModelChange" /><text v-if="cgModel == 0">关闭</text><text v-else>开启</text>
+            <div class="tui-title">采购模式：</div>
+
+            <radio-group class="tui-input" @change="cgModelChange">
+              <label class="list" for="cModeJy">
+                <radio id="cModeJy" value="1" :checked="cgModel == 1" />
+                <span class="checkbox-text">简约</span>
+              </label>
+              <label class="list" for="cModelBz">
+                <radio id="cModelBz" value="0" :checked="cgModel == 0" />
+                <span class="checkbox-text">标准</span>
+              </label>
+            </radio-group>
+
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="false" v-if="cgModel == 1">
-            <div class="tui-title">运费成本：</div>
-            <input v-model="form.cgPerCost" type="digit" placeholder-class="phcolor" class="tui-input" @focus="form.cgPerCost=''" name="cgPerCost" placeholder="每公斤的运费成本" />
+            <div class="tui-title">每公斤运费：</div>
+            <input v-model="form.cgPerCost" type="digit" placeholder-class="phcolor" class="tui-input" @focus="form.cgPerCost=''" name="cgPerCost" placeholder="" />
           </tui-list-cell>
 
         </div>
@@ -44,12 +55,8 @@ export default {
   },
   methods: {
     cgModelChange(e){
-			let value = e.target.value
-            if(value){
-                this.cgModel = 1
-            }else{
-                this.cgModel = 0
-            }
+			  let value = e.detail.value
+        this.cgModel = value
     },
     init(){
       if(this.hasLoad){

ghsApp/src/admin/custom/levelSet.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="ex-page">
         <view class="title">
-            请设置每个等级客户需要消费的最低数量和金额：
+            每个等级需要消费的最少扎数和金额：
         </view>
         <view class="recharge-list">
 
             <view>
                 <view class="item">
-                    <view>标准会员：
+                    <view>普店：
 <input v-model="levelInfo.num" @click="levelInfo.num=''" placeholder-class="phcolor" class="tui-input" type="number"  /> 扎
 <input v-model="levelInfo.amount" @click="levelInfo.amount=''" placeholder-class="phcolor" class="tui-input" type="digit"  /> 元
                     </view>
@@ -16,7 +16,7 @@
 
             <view>
                 <view class="item">
-                    <view>黄金会员：
+                    <view>银店：
 <input v-model="levelInfo.hjNum" @click="levelInfo.hjNum=''" placeholder-class="phcolor" class="tui-input" type="number"  /> 扎
 <input v-model="levelInfo.hjAmount" @click="levelInfo.hjAmount=''" placeholder-class="phcolor" class="tui-input" type="digit"  /> 元
                     </view>
@@ -25,7 +25,7 @@
 
             <view>
                 <view class="item">
-                    <view>钻石会员：
+                    <view>金店：
 <input v-model="levelInfo.zsNum" @click="levelInfo.zsNum=''" placeholder-class="phcolor" class="tui-input" type="number"  /> 扎
 <input v-model="levelInfo.zsAmount" @click="levelInfo.zsAmount=''" placeholder-class="phcolor" class="tui-input" type="digit"  /> 元
                     </view>

ghsApp/src/admin/home/apply.vue

@@ -31,17 +31,6 @@ export default {
     data(){
         return {
             menuList: [
-                {
-                    title:'营销推广',
-                    list:[
-                        {name: "新客福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/xrFl"},
-                        {name: "推荐福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/tjFl"},
-                        {name: "充值福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/item/rechargeHb"},
-                        {name: "充值记录",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/rechargeList"},
-                        {name: "已发红包",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/list"},
-						{name: "邀请开店",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/pagesInvite/list"}
-                    ]
-                },
                 {
                     title:'花材',
                     list:[
@@ -63,20 +52,41 @@ export default {
                 {
                     title:'门店',
                     list:[
-                        {name: "客户等级",img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,url: "/admin/custom/levelSet"},
                         {name: "门店",img: `${this.$constant.imgUrl}/ghs/home/shop.png`,url: "/admin/shop/list"},
                         {name: "员工",img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,url: "/admin/staff/list"},
                         {name: "调拨出库",img: `${this.$constant.imgUrl}/ghs/home/dbck.png`,url: "/pagesStorehouse/allot/allotEx"},
                         {name: "调拨入库",img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,url: "/pagesStorehouse/allot/allotPut"},
-                        {name: "库存预警",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/pagesStorehouse/stockWarn/manage"},
-                        {name: "盘点",img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,url: "/pagesStorehouse/inventory/list"},
                         {name: "员工业绩",img: `${this.$constant.imgUrl}/ghs/home/icon_ygyj.png`,url: "/admin/staff/achieve"},
-                        {name: "供应商",img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`,url: "/admin/ghs/shop"},
-                        {name: "报损单",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/admin/breakage/list"},
+                        {name: "客户等级标准",img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,url: "/admin/custom/levelSet"},
+                    ]
+                },
+                {
+                    title:'采购与供应商',
+                    list:[
+                        {name: "供应商",img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`,url: "/pagesPurchase/supplier"},
                         {name: "采购单",img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`,url: "/pagesPurchase/order"},
                         {name: "采购设置",img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`,url: "/admin/cg/set"},
                     ]
-                }
+                },
+                {
+                    title:'库存管理',
+                    list:[
+                        {name: "库存预警",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/pagesStorehouse/stockWarn/manage"},
+                        {name: "盘点",img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,url: "/pagesStorehouse/inventory/list"},
+                        {name: "报损单",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/admin/breakage/list"},
+                    ]
+                },
+                {
+                    title:'代理商',
+                    list:[
+                        // {name: "新客福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/xrFl"},
+                        // {name: "推荐福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/tjFl"},
+                        // {name: "充值福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/item/rechargeHb"},
+                        // {name: "充值记录",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/rechargeList"},
+                        // {name: "已发红包",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/list"},
+						{name: "邀请记录",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/pagesInvite/list"}
+                    ]
+                },
             ]
         }
     },
@@ -89,14 +99,14 @@ export default {
 <style lang="scss" scoped>
 .apply-content_box {
     padding-top: 1upx;
-    padding-bottom: 60upx;
+    padding-bottom: 30upx;
     & .apply-list_box {
         margin-top: 20px;
         padding:40upx 30upx;
         background-color: #FFFFFF;
         & > .tit {
             color: #333333;
-            font-size: 32upx;
+            font-size: 30upx;
             font-weight: 600;
         }
     }

ghsApp/src/admin/item/detail.vue

@@ -61,7 +61,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">库存</div>
           <input v-model="form.stock" style="width:340rpx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-          <button v-if="productData.id" class="admin-button-com blue small" @click="goStockDetail(productData.id)">变动明细</button>
+          <button v-if="productData.id" class="admin-button-com blue small" @click="goStockDetail(productData.id)">库存明细</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">

ghsApp/src/admin/itemClass/list.vue

@@ -17,7 +17,7 @@
 							</div>
 							<div class="operate-icon-wrap">
 								<div class="operate-icon">
-									<i class="iconfont" :class="[ index == operateIndex ? 'iconcaozuojihuo' : 'iconcaozuo']" style="font-size:38rpx;"></i>
+									<i class="iconfont" :class="[ index == operateIndex ? 'iconbianji' : 'iconbianji']" style="font-size:38rpx;"></i>
 								</div>
 							</div>
 						</div>

ghsApp/src/admin/staff/add.vue

@@ -31,18 +31,6 @@
         </div>
         <!-- 登录信息 -->
         <div class="module-com input-line-wrap">
-          <tui-list-cell class="line-cell" :hover="false">
-            <div class="tui-title">登录密码</div>
-            <input
-              v-model="form.password"
-              placeholder-class="phcolor"
-              class="tui-input"
-              name="password"
-              placeholder="请输入"
-              maxlength="50"
-              type="password"
-            />
-          </tui-list-cell>
           <tui-list-cell class="line-cell remark-wrap" :hover="false">
             <div class="tui-title">备注信息</div>
             <div class="tui-input">
@@ -50,7 +38,7 @@
                 v-model="form.remark"
                 class="tui-textarea remark"
                 placeholder-class="phcolor"
-                placeholder="请输入内容"
+                placeholder="选填"
               />
             </div>
           </tui-list-cell>

ghsApp/src/admin/staff/list.vue

@@ -47,7 +47,6 @@
 			</div>
 			<!-- 按钮 -->
 			<div class="app-footer">
-				<text style="color:#3385FF;margin-right:80rpx;" @click="getPCAddress()" >PC端后台网址</text>
 				<div class="admin-button-com middle blue" @click="pageTo({url: '/admin/staff/add'})">添加员工</div>
 			</div>
 		</block>

ghsApp/src/pages.json

@@ -30,7 +30,7 @@
 			"root": "admin/custom",
 			"pages": [
 				{"path": "selectCustom","style": {"navigationBarTitleText": "选择客户"}},
-				{"path": "levelSet","style": {"navigationBarTitleText": "客户等级"}},
+				{"path": "levelSet","style": {"navigationBarTitleText": "客户等级标准"}},
 				{"path": "visit","style": {"navigationBarTitleText": "今日访客"}}
 			]
 		},

ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -88,12 +88,12 @@
 		<view class="bar-view">
 			<view class="info-view"> 入库数量：{{ sumCount }} </view>
 			<view class="btn-view" v-if="putData.status == PUT_STATUS.CONFIRM">
-				<button class="admin-button-com middle" @click="confirmPutEvent">
-					入库
-				</button>
 				<button class="admin-button-com middle" @click="cancelPutEvent">
 					取消入库
 				</button>
+				<button class="admin-button-com middle" @click="confirmPutEvent">
+					确认入库
+				</button>
 			</view>
 		</view>
 	</view>

hdApp/src/admin/ghsProduct/detail.vue

@@ -27,10 +27,10 @@
     </div>
     <div class="shop-express app-color-3">
 
-      <text>大众会员 {{parseFloat(productInfo.originalInfo.skPrice)||0}}</text>
-      <text>标准会员{{parseFloat(productInfo.originalInfo.price)||0}}</text>
-      <text>黄金会员 {{parseFloat(productInfo.originalInfo.hjPrice)||0}}</text>
-      <text>钻石会员 {{parseFloat(productInfo.originalInfo.zsPrice)||0}}</text>
+      <text>散客 {{parseFloat(productInfo.originalInfo.skPrice)||0}}</text>
+      <text>普店{{parseFloat(productInfo.originalInfo.price)||0}}</text>
+      <text>银店 {{parseFloat(productInfo.originalInfo.hjPrice)||0}}</text>
+      <text>金店 {{parseFloat(productInfo.originalInfo.zsPrice)||0}}</text>
 
     </div>
 

hdApp/src/components/app-customer-sel.vue

@@ -128,13 +128,13 @@ export default {
 			let levelName = "";
 			switch (Number(level)) {
 				case 0:
-					levelName = "大众会员";
+					levelName = "散客";
 					break;
 				case 1:
-					levelName = "标准会员";
+					levelName = "普店";
 					break;
 				case 2:
-					levelName = "黄金会员";
+					levelName = "银店";
 					break;
 
 				default:

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -8,7 +8,7 @@
 
 			<view class="shop_title" @click="pageTo({url:'/pagesPurchase/level?id='+ghsInfo.id})">
 				{{ghsInfo.name}}
-				<text class="level">{{ghsInfo.giveLevelName||'大众会员'}}</text>
+				<text class="level">{{ghsInfo.giveLevelName||'普店'}}</text>
 			</view>
 
 			<view v-if="ghsInfo.hasRechargeHb && ghsInfo.hasRechargeHb ==1" class="shop_intro" @tap="recharge(ghsInfo)">