lilei 8 ヶ月 前
コミット
9459cafeb8

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 <script>
 	export default {
 	export default {
 		globalData: {
 		globalData: {
-			// baseUrl: 'http://192.168.2.100:9110/saas/clz/', // 本地
-			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			baseUrl: 'http://192.168.2.100:9110/saas/clz/', // 本地
+			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		},
 		onLaunch: function() {
 		onLaunch: function() {

+ 7 - 0
pages.json

@@ -516,6 +516,13 @@
 				"renderer":"skyline",
 				"renderer":"skyline",
 				"componentFramework": "glass-easel"
 				"componentFramework": "glass-easel"
         	}
         	}
+        },
+        {
+        	"path" : "shopShow/shopShow",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "商城显示设置"
+        	}
         }
         }
 		]
 		]
 	}
 	}

+ 5 - 8
pages/index/index.vue

@@ -35,15 +35,11 @@
 					<view class="notices flex align_center" v-if="!bondRecord&&orderTodo" @click="toOrder">
 					<view class="notices flex align_center" v-if="!bondRecord&&orderTodo" @click="toOrder">
 						<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有待取货的货架订单哦!</view> <text class="text">立即处理>></text>
 						<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有待取货的货架订单哦!</view> <text class="text">立即处理>></text>
 					</view>
 					</view>
-					<!-- 去认证门店 -->
-					<view class="notices flex" v-if="hasLogin&&userInfo&&userInfo.sysUserFlag == '0'">
-						<!-- 门店审核不通过 -->
-						<view class="flex justify_between align_center" v-if="storeApply&&storeApply.auditStatus=='REFUSE'&&storeApply.readFlag=='0'">
+					<!-- 门店审核不通过 -->
+					<view class="notices flex" v-if="storeApply&&storeApply.auditStatus=='REFUSE'&&storeApply.readFlag=='0'">
+						<view class="flex justify_between align_center">
 							<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 门店认证资料审核不通过,请重新提交审核!</view> <text class="text" @click="toKnow">知道了</text>
 							<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 门店认证资料审核不通过,请重新提交审核!</view> <text class="text" @click="toKnow">知道了</text>
 						</view>
 						</view>
-						<view class="flex justify_between align_center" v-else>
-							<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> {{storeApply&&storeApply.auditStatus=='WAIT'?'认证门店审核中':'您还未认证门店'}}</view> <text class="text" @click="authStore">{{storeApply&&storeApply.auditStatus=='WAIT'?'查看':'去认证'}}</text>
-						</view>
 					</view>
 					</view>
 					<!-- 名片 -->
 					<!-- 名片 -->
 					<view class="userCard flex align_center justify_between" v-if="!hasShopiing">
 					<view class="userCard flex align_center justify_between" v-if="!hasShopiing">
@@ -460,6 +456,7 @@
 			getHasShopping(flag){
 			getHasShopping(flag){
 				getShopStatus().then(res => {
 				getShopStatus().then(res => {
 					this.hasShopiing = res.data && res.data.paramValue == 1
 					this.hasShopiing = res.data && res.data.paramValue == 1
+					this.$store.state.vuex_hasShopiing = this.hasShopiing
 					// 有商城
 					// 有商城
 					if(this.hasShopiing){
 					if(this.hasShopiing){
 						this.showShopPage(flag)
 						this.showShopPage(flag)
@@ -932,7 +929,7 @@
 						})
 						})
 					}else{
 					}else{
 						// 或 门店认证
 						// 或 门店认证
-						toAuthStore()
+						this.authStore()
 					}
 					}
 				}else{
 				}else{
 					toLogin()
 					toLogin()

+ 11 - 0
pages/morePage/morePage.vue

@@ -139,6 +139,9 @@
 				const rule = this.$store.state.vuex_rewardRule
 				const rule = this.$store.state.vuex_rewardRule
 				return rule&&rule.ruleStatus == 'release'
 				return rule&&rule.ruleStatus == 'release'
 			},
 			},
+			hasShopSeting(){
+				return this.$store.state.vuex_hasShopiing
+			},
 			itemList(){
 			itemList(){
 				const list = [
 				const list = [
 					{
 					{
@@ -298,6 +301,14 @@
 								color: '#55aaff',
 								color: '#55aaff',
 								isShelf: true
 								isShelf: true
 							},
 							},
+							{
+								text: '商城显示设置',
+								icon: 'shangcheng',
+								auth: this.$hasPermissions('M_priceShow_mini')&&this.hasShopSeting,
+								path: '/pagesB/shopShow/shopShow',
+								color: '#00aa00',
+								isShelf: true
+							},
 						],
 						],
 					}
 					}
 				]
 				]

+ 2 - 2
pages/storeManage/roleSetting/roleAuthSet.vue

@@ -9,8 +9,8 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="leve_0" v-if="authList.length" v-for="(item,index) in authList" :key="item.id">
 			<view class="leve_0" v-if="authList.length" v-for="(item,index) in authList" :key="item.id">
-				<view class="leve_1">
-					<label @click="checkParent(item)">
+				<view class="leve_1" @click="checkParent(item)">
+					<label>
 					<checkbox :value="String(item.id)" :checked="item.checked" /> {{item.name}}
 					<checkbox :value="String(item.id)" :checked="item.checked" /> {{item.name}}
 					</label>
 					</label>
 				</view>
 				</view>

+ 141 - 0
pagesB/shopShow/shopShow.vue

@@ -0,0 +1,141 @@
+<template>
+	<view class="page-body scroll-list">
+		<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+			<view style="height: 20rpx;" ></view>
+			<view  
+			class="check-order-list" 
+			v-for="(item,index) in list" 
+			:key="item.id" 
+			>
+				<view class="flex align_center justify_between" @click="editPerson(item)">
+					<view class="u-name">
+						<text style="margin-right: 0.5rem;">{{item.name}}</text>
+						<u-icon :name="item.sex==1?'man':'woman'" size="28" :color="item.sex==1?'#00aaff':'#ffaaaa'"></u-icon>
+					</view>
+					<view class="u-mobile">
+						<text v-if="item.isManager == 1">门店负责人\ </text>
+						<text v-if="item.isManager == 0 && item.roleNames">{{item.roleNames}} / </text>
+						{{item.mobile}}
+					</view>
+				</view>
+				<view class="set-item flex align_center justify_between">
+					商城是否显示:
+					<u-radio-group @change="e=>changeShow(e,item)" v-model="item.show" :width="150">
+						<u-radio :name="1">是</u-radio>
+						<u-radio :name="0">否</u-radio>
+					</u-radio-group>
+				</view>
+			 </view>
+			 <view style="padding:0 30upx 30upx;">
+				 <u-empty :src="`/static/nodata.png`" icon-size="180" :text="noDataText" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
+				 <u-loadmore v-if="(total>=list.length&&list.length)||status=='loading'" :status="status" />
+			 </view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import {searchEmployee, delEmployee } from '@/api/employee'
+	import moment from 'moment'
+	export default{
+		name:'personnel',
+		data(){
+			return{
+				status: 'loading',
+				noDataText: '暂无数据',
+				// 查询条件
+				pageNo: 1,
+				pageSize: 20,
+				list: [],
+				total: 0,
+			}
+		},
+		onShow() {
+			this.getRow(1)
+		},
+		computed:{
+			userInfo(){
+				return this.$store.state.vuex_userInfo
+			},
+			hasOnlyAdmin(){
+				return this.list.length ==1 && this.list[0].isManager == 1 || this.list.length == 0
+			}
+		},
+		methods:{
+			// 查询列表
+			getRow (pageNo) {
+			  let _this = this
+			  if (pageNo) {
+			    this.pageNo = pageNo
+			  }
+			  let params = {
+			    pageNo:this.pageNo,
+			    pageSize:this.pageSize
+			  }
+			  this.status = "loading"
+			  searchEmployee(params).then(res => {
+				if (res.code == 200 || res.status == 204 || res.status == 200) {
+				  const list = res.data.list || []
+				  list.forEach(item=>{
+					  item.show = 0
+				  })
+				  if(_this.pageNo>1){
+					  _this.list = _this.list.concat(list)
+				  }else{
+					  _this.list = list
+				  }
+				  _this.total = res.data.count || 0
+				} else {
+				  _this.list = []
+				  _this.total = 0
+				  _this.noDataText = res.message
+				}
+				 
+				_this.status = _this.total>=_this.list.length ? "nomore" : 'loadmore'
+			  })
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {
+				if(this.list.length < this.total){
+					this.pageNo += 1
+					this.getRow()
+				}else{
+					this.status = "nomore"
+				}
+			},
+			changeShow(e,item){
+				console.log(e,item)
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.page-body{
+		height: 100vh;
+		padding:0;
+	}
+	.scroll-list{
+		.check-order-list{
+			background: #ffffff;
+			padding: 10upx 20upx;
+			margin: 0 25rpx 25rpx 25rpx;
+			border-radius: 20upx;
+			box-shadow: 1px 1px 3px #EEEEEE;
+			> view{
+				padding: 0.5rem;
+				.u-name{
+					font-size: 32rpx;
+				}
+				.u-mobile{
+					color: #666;
+				}
+			}
+		}
+		.set-item {
+			/deep/ .u-radio__label{
+				flex: 1;
+			}
+		}
+	}
+</style>

ファイルの差分が大きいため隠しています
+ 0 - 0
static/iconfont/iconfont.css


+ 1 - 0
store/index.js

@@ -65,6 +65,7 @@ const store = new Vuex.Store({
 		vuex_storeAuthInfo: null ,// 门店认证状态信息
 		vuex_storeAuthInfo: null ,// 门店认证状态信息
 		vuex_tempData: null, // 临时数据
 		vuex_tempData: null, // 临时数据
 		vuex_configPrice: null, // 价格显示配置
 		vuex_configPrice: null, // 价格显示配置
+		vuex_hasShopiing: false, // 是否有商城
 		vuex_uuidTempData: lifeData.vuex_uuidTempData ? lifeData.vuex_uuidTempData : null, // 唯一码临时数据
 		vuex_uuidTempData: lifeData.vuex_uuidTempData ? lifeData.vuex_uuidTempData : null, // 唯一码临时数据
 		vuex_cartList: lifeData.vuex_cartList ? lifeData.vuex_cartList : [], // 购物车列表按活动缓存
 		vuex_cartList: lifeData.vuex_cartList ? lifeData.vuex_cartList : [], // 购物车列表按活动缓存
 		vuex_tabBarList: [
 		vuex_tabBarList: [

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません