调整细节

pages/index/index.vue

@@ -5,7 +5,7 @@
 			<view class="fl-rsb wcolor user-area">
 				<view class="fl" @click="toUrl('/pages/setting/userInfo')">
 					<u-avatar size='65' fontSize="65" :src="userInfo!== null && userInfo.headImgSrc"></u-avatar>
-					<view class="mgl10 userName">Hi , {{ userInfo!== null && userInfo.st_name }}</view>
+					<view class="mgl10 userName">{{ userInfo!== null && userInfo.st_name }}</view>
 				</view>
 				<view>
 					<view class="mgr5"><u--image :showLoading="true" :src="imgbaseUrl + 'setting.png'" width="25px" height="25px" @click="toUrl('/pages/setting/setting')"></u--image></view>

pages/workSpace/jijian/jijianSQ.vue

@@ -5,8 +5,9 @@
 			<view class="pdb10">
 				<view class="pdb fl-rsbc">
 					<view class="fl">
-						<view class="cu mgr5"><u--image :showLoading="true" :src="imgbaseUrl + 'jibenxinxi.png'" width="25px" height="25px"></u--image></view>
-						<view class="stit wcolor" style="width: 80px;">基本信息</view> 
+						<view class="cu mgr5"><u--image :showLoading="true" :src="imgbaseUrl + 'jibenxinxi.png'"
+								width="25px" height="25px"></u--image></view>
+						<view class="stit wcolor" style="width: 80px;">基本信息</view>
 					</view>
 				</view>
 				<view class="mgb10 cardview bgwhite pdb">
@@ -23,39 +24,40 @@
 			</view>
 			<view class="pdb fl-rsbc">
 				<view class="fl">
-					<view class="cu mgr5"><u--image :showLoading="true" :src="imgbaseUrl + 'jijian.png'" width="25px" height="25px"></u--image></view>
-					<view class="stit" style="width: 80px;">寄件人信息</view> 
+					<view class="cu mgr5"><u--image :showLoading="true" :src="imgbaseUrl + 'jijian.png'" width="25px"
+							height="25px"></u--image></view>
+					<view class="stit" style="width: 80px;">寄件人信息</view>
 				</view>
 			</view>
-				<view class="mgb10 cardview bgwhite">
-					<view class="pdlr">
-						<view class="mgb">
-							<view class="fl-rsb mgb">
-								<view class="pdtb10 fl-rsbc bgwhite bd1 mgr">
-									<u--input border="none" placeholder="请输入姓名" type="number" clearable></u--input>
-								</view>
-								<view class="pdtb10 fl-rsbc bgwhite bd1">
-									<u--input border="none" placeholder="请输入电话" type="number" clearable></u--input>
-								</view>
+			<view class="mgb cardview bgwhite">
+				<view class="pdlr">
+					<view class="mgb">
+						<view class="fl-rsb mgb">
+							<view class="pdtb10 fl-rsbc bgwhite bd1 mgr">
+								<u--input border="none" placeholder="请输入姓名" type="number" clearable></u--input>
 							</view>
-							<!-- 						<view class="mgtb fl-rsbc">
+							<view class="pdtb10 fl-rsbc bgwhite bd1">
+								<u--input border="none" placeholder="请输入电话" type="number" clearable></u--input>
+							</view>
+						</view>
+						<!-- 						<view class="mgtb fl-rsbc">
 							<view class="desctit">备注：</view>
 						</view> -->
-							<view class="fl-rsbc">
-								<u--textarea height="140" v-model="cgForm.remark" placeholder="请输入备注内容"
-									count></u--textarea>
-							</view>
+						<view class="fl-rsbc">
+							<u--textarea height="140" v-model="cgForm.remark" placeholder="请输入备注内容" count></u--textarea>
 						</view>
 					</view>
 				</view>
+			</view>
 			<view class="mgb">
 				<view class="pdb fl-rsbc">
 					<view class="fl">
-						<view class="cu mgr5"><u--image :showLoading="true" :src="imgbaseUrl + 'shoujian.png'" width="25px" height="25px"></u--image></view>
-						<view class="stit" style="width: 80px;">收件人信息</view> 
+						<view class="cu mgr5"><u--image :showLoading="true" :src="imgbaseUrl + 'shoujian.png'"
+								width="25px" height="25px"></u--image></view>
+						<view class="stit" style="width: 80px;">收件人信息</view>
 					</view>
 				</view>
-				<view class="cardview bgwhite pd">
+				<view class="cardview bgwhite pdlr pdb">
 					<view class="fl-rsb">
 						<view class="pdtb10 fl-rsbc bgwhite bd1 mgr">
 							<u--input border="none" placeholder="请输入姓名" type="number" clearable></u--input>
@@ -206,10 +208,10 @@
 			},
 		},
 		methods: {
-			async initData(){
+			async initData() {
 				// 获取采购列表
-				await this.getWupinTypeList("dict_dq").then(res=>{
-					console.log('getWupinTypeList',res)
+				await this.getWupinTypeList("dict_dq").then(res => {
+					console.log('getWupinTypeList', res)
 					// this.dataTree = res
 				})
 			},

pages/workSpace/jiudian/jiudianSQ.vue

@@ -48,7 +48,7 @@
 						<view class="stit" style="width: 80px;">房间信息</view> 
 					</view>
 				</view>
-				<view class="cardview bgwhite pd">
+				<view class="cardview bgwhite pdlr pdb">
 					<view class="fl-rsb">
 						<view class="pdtb10 fl-rsbc bgwhite bd1 mgr">
 							<u--input border="none" placeholder="房间单价" type="number" clearable></u--input>

pages/workSpace/wupin/wupinCG.vue

@@ -114,6 +114,10 @@
 </template>
 
 <script>
+	import {
+		mapGetters,
+		mapState
+	} from 'vuex';
 	import CardTit from '@/components/cardTit.vue'
 	import AddWupin from '@/pages/workSpace/wupin/addWupin.vue'
 	import addDonegoodsCard from '@/components/addDonegoodsCard.vue'
@@ -192,7 +196,7 @@
 				},
 				actions: [],
 				ckActions: [],
-				userInfo: {}
+				// userInfo: {}
 			};
 		},
 		created() {
@@ -365,6 +369,12 @@
 			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
 			this.$refs.uForm.setRules(this.rules)
 		},
+		computed: {
+			...mapGetters(['isLoggedIn']),
+			...mapState({
+				userInfo: state => state.userStore.userInfo,
+			})
+		},
 	};
 </script>
 <style scoped>

pages/workSpace/wupin/wupinCGList.vue

@@ -16,9 +16,12 @@
 </template>
 
 <script>
+	import {
+		mapGetters,
+		mapState
+	} from 'vuex';
 	import XzCardListItem from "@/components/xzCardListItem.vue";
 	import store from '@/store/index.js';
-	import { mapState } from 'vuex'//引入mapState
 	export default {
 		components:{XzCardListItem},
 		data() {
@@ -38,13 +41,6 @@
 				sqDataList:[]
 			};
 		},
-		computed: {
-			//使用对象展开运算符将此对象混入到外部对象中
-			...mapState({
-				username: state => state.username,
-				age: state => state.age,
-			})
-		},
 		onLoad() {
 			// 设置首页标题
 			uni.setNavigationBarTitle({
@@ -66,16 +62,6 @@
 			initData() {
 				// 获取采购列表
 				console.log("initData");
-				let _self = this
-				uni.getStorage({
-					key: 'userInfo',
-					success: function (res) {
-						console.log(res.data);
-						if(res.data){
-							_self.userInfo = res.data
-						}
-					}
-				});
 				if(this.userInfo){
 					const parameter = {"st_id":this.userInfo.st_id,"zyid":""};
 					uni.$u.http.post('/xzgl/cgsqList', parameter ).then(data => {
@@ -149,6 +135,12 @@
 				});
 			},
 		},
+		computed: {
+			...mapGetters(['isLoggedIn']),
+			...mapState({
+				userInfo: state => state.userStore.userInfo,
+			})
+		},
 	}
 </script>
 

pages/workSpace/wupin/wupinSLList.vue

@@ -17,6 +17,10 @@
 
 <script>
 	import XzCardListItem from "@/components/xzCardListItem.vue"
+	import {
+		mapGetters,
+		mapState
+	} from 'vuex';
 	export default {
 		components:{XzCardListItem},
 		data() {
@@ -47,16 +51,6 @@
 			initData() {
 				// 获取采购列表
 				console.log("initData");
-				let _self = this
-				uni.getStorage({
-					key: 'userInfo',
-					success: function (res) {
-						console.log(res.data);
-						if(res.data){
-							_self.userInfo = res.data
-						}
-					}
-				});
 				if(this.userInfo){
 					const parameter = {"st_id":this.userInfo.st_id,"zyid":""};
 					uni.$u.http.post('/xzgl/wllyList', parameter ).then(data => {
@@ -131,6 +125,12 @@
 				});
 			},
 		},
+		computed: {
+			...mapGetters(['isLoggedIn']),
+			...mapState({
+				userInfo: state => state.userStore.userInfo,
+			})
+		},
 	}
 </script>