Browse Source

bug 修复

lilei 3 years ago
parent
commit
a8c2773d3e
4 changed files with 10 additions and 12 deletions
  1. 2 2
      App.vue
  2. 7 6
      pages/index/index.vue
  3. 0 3
      pages/scan-frame/scan-frame.vue
  4. 1 1
      pages/vinRecord/vinRecord.vue

+ 2 - 2
App.vue

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

+ 7 - 6
pages/index/index.vue

@@ -63,7 +63,7 @@
 		<view class="list-box">
 			<!-- 扫描记录 -->
 			<u-cell-group :border="false">
-				<u-cell-item title="VIN查询历史" @click="toAllRecord" :title-style="{fontSize:'1em'}" :value="userInfo&&userInfo.sysUserFlag == '0'?'':'全部'">
+				<u-cell-item title="VIN查询历史" @click="toAllRecord" :title-style="{fontSize:'1em'}" value="全部">
 					<u-icon slot="icon" size="38" color="#066cff" style="margin-right: 0.3em;" name="order"></u-icon>
 				</u-cell-item>
 			</u-cell-group>
@@ -142,6 +142,9 @@
 			}
 		},
 		onLoad() {
+			this.orderTodo = null
+			this.bondRecord = null
+			this.vinList = []
 			// 检测是否登录
 			this.$store.dispatch('checkLogin',()=>{
 				// 获取数据字典
@@ -337,11 +340,9 @@
 			},
 			// 查看扫描记录
 			toAllRecord(){
-				if(this.userInfo.sysUserFlag == '1'){
-					uni.navigateTo({
-						url: this.hasLogin ? "/pages/vinRecord/vinRecord" : '/pages/login/login'
-					})
-				}
+				uni.navigateTo({
+					url: this.hasLogin ? "/pages/vinRecord/vinRecord" : '/pages/login/login'
+				})
 			},
 			toUser(){
 				if(this.hasLogin){

+ 0 - 3
pages/scan-frame/scan-frame.vue

@@ -269,9 +269,6 @@ export default {
 		  color:#ffff00;
 	  }
   }
-  .tips{
-	  bottom: 90vh;
-  }
   .scanBtn {
     width: 100%;
     z-index: 99999;

+ 1 - 1
pages/vinRecord/vinRecord.vue

@@ -13,7 +13,7 @@
 								<text class="vin-text">{{item.vinCode}}</text>
 								<text class="time-text">{{item.createDate}}</text>
 							</view>
-							<view>{{item.modelInfo}}</view>
+							<view v-if="userInfo.sysUserFlag == '1'">{{item.modelInfo}}</view>
 						</view>
 					</view>
 					 <view style="padding: 20upx;">