ccj 2 anni fa
parent
commit
52c1c2b2a5
3 ha cambiato i file con 30 aggiunte e 3 eliminazioni
  1. 2 2
      config/index.js
  2. 26 1
      pages/erpbusiness/quality_testing.vue
  3. 2 0
      pages/user/user.vue

+ 2 - 2
config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	baseUrlNew: 'http://192.168.110.67:9100/',
+	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
@@ -10,7 +10,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 26 - 1
pages/erpbusiness/quality_testing.vue

@@ -20,10 +20,16 @@
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
 			<view class='changewarehouse'>
-				<view @click='show=true'>{{warehouseName?warehouseName:'选择仓库'}}<text class='cuIcon-unfold'></text></view>
+				<view  @click='show=true'>{{warehouseName?warehouseName:'选择仓库'}}<text class='cuIcon-unfold'></text></view>
 				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show"
 					:range="selector"></u-picker>
 			</view>
+			<view >
+			<view  @click='show=true' class="company">
+				<image class='icon' style='width:19px;height:19px;' src="../../static/img/icon_qiye@3x.png"
+					mode=""></image> {{compName}}
+			</view>
+			</view>
 		</view>
 		<view class="content">
 			<view style='background:#fff;' class="flex">
@@ -139,6 +145,7 @@
 		},
 		data() {
 			return {
+				compName:'',
 				inputShow: false,
 				modalName: '',
 				mycarStyle: '',
@@ -277,6 +284,8 @@
 					this.getList(true)
 				}
 			})
+			that.compName = uni.getStorageSync('compName1')
+			
 		},
 		methods: {
 			print(item){
@@ -1143,4 +1152,20 @@
 	.center {
 		padding-bottom: 150rpx;
 	}
+	.company {
+		position: fixed;
+		right: 0;
+		top: 18%;
+		background: url('../../static/img/qiyebeijing.png');
+		background-size: 100%;
+		font-size: 11px;
+		padding-bottom: 5px;
+		padding-left: 10px;
+		border-radius: 40rpx 0 0 40rpx;
+	}
+	
+	.company .icon {
+		position: relative;
+		top: 4px;
+	}
 </style>

+ 2 - 0
pages/user/user.vue

@@ -484,6 +484,7 @@
 
 				// 	}
 				// });
+				that.compName = uni.getStorageSync('compName1')
 				that.$api.doRequest('get', '/commonUser/getCompOwn', {
 					phone: that.userInfo.phone
 				}).then(res => {
@@ -541,6 +542,7 @@
 								veriCode: "123456",
 							}).then(res1 => {
 								console.log("loginQuickly", res)
+								uni.setStorageSync("cangid",'')
 								if (res1.data.code == 200) {
 									uni.setStorageSync('pcUserInfo', res1.data.data)
 									uni.setStorageSync('compName1', that.companyList[e[0]].compName)