Signed-off-by: zhaobao <528046418@qq.com>

config/index.js

@@ -1,8 +1,8 @@
 export default {
     base: {
       dev: 'https://api.xazhyc.com',
-	  // dev: 'http://1.15.92.205:8001',
-	  // dev: 'http://192.168.3.253:8001',
+	  // dev: 'http://1.15.92.205:6001',
+	  // dev: 'http://192.168.3.253:7001',
       pro: 'https://api.xazhyc.com'
     },
 	appID: '10007',

pages/index/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="container">
-		<view class="doctor-info" :style="{backgroundImage: 'url('+bg+')'}">	
+		<view class="doctor-info">	
+			<image :src="bg" class="bg"></image>
 			<view class="user">
 				<view class="info">
 					<view class="name">{{user.userName}}</view>
@@ -102,6 +103,7 @@
 					return
 				}
 				getByQr(ocId, code).then((res)=>{
+					let type=res.data.targetType					
 					uni.setStorageSync('qrcode',{
 						...res.data.target,
 						targetId:res.data.targetId,
@@ -109,16 +111,24 @@
 						targetTitle:res.data.targetTitle,
 						ocId,
 						code
-					})				
+					})
+					let desc="";
+					if(type===1){desc=res.data.target.riskPointDesc}
+					if(type===2){desc=res.data.target.gridDesc}	
+					if(type===3){
+						desc=res.data.target.equipDesc;
+						res.data.target.positionName=res.data.target.equipCatTitle
+					}
+					if(type===4){desc=res.data.target.doctorDesc}
+					if(type===5){desc=res.data.target.doctorDesc}
 					this.user={
 						type:res.data.targetType,
 						userName:res.data.targetTitle,
 						groupName:res.data.target.groupName,
 						userAvatar:res.data.target.doctorAvatar,
 						positionName:res.data.target.positionName,
-						userIntro:res.data.target.doctorDesc,
+						userIntro:desc,
 					}
-					let type=res.data.targetType
 					if(type>3){
 						this.bg='/static/index/bg.png'
 					}else{
@@ -177,6 +187,16 @@
 			padding: 30rpx 48rpx 48rpx 48rpx;
 			box-sizing: border-box;
 			color: #fff;
+			position: relative;
+			.bg{
+				display: block;
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				z-index: -1;
+			}
 			.user{
 				 display: flex;
 				 justify-content: space-between;

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -21425,8 +21425,8 @@ exports.default = void 0;
 var _default = {
   base: {
     dev: 'https://api.xazhyc.com',
-    // dev: 'http://1.15.92.205:8001',
-    // dev: 'http://192.168.3.253:8001',
+    // dev: 'http://1.15.92.205:6001',
+    // dev: 'http://192.168.3.253:7001',
     pro: 'https://api.xazhyc.com'
   },
   appID: '10007',

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -239,6 +239,7 @@ var _default = {
         return;
       }
       (0, _scan.getByQr)(ocId, code).then(function (res) {
+        var type = res.data.targetType;
         uni.setStorageSync('qrcode', _objectSpread(_objectSpread({}, res.data.target), {}, {
           targetId: res.data.targetId,
           targetType: res.data.targetType,
@@ -246,15 +247,31 @@ var _default = {
           ocId: ocId,
           code: code
         }));
+        var desc = "";
+        if (type === 1) {
+          desc = res.data.target.riskPointDesc;
+        }
+        if (type === 2) {
+          desc = res.data.target.gridDesc;
+        }
+        if (type === 3) {
+          desc = res.data.target.equipDesc;
+          res.data.target.positionName = res.data.target.equipCatTitle;
+        }
+        if (type === 4) {
+          desc = res.data.target.doctorDesc;
+        }
+        if (type === 5) {
+          desc = res.data.target.doctorDesc;
+        }
         _this2.user = {
           type: res.data.targetType,
           userName: res.data.targetTitle,
           groupName: res.data.target.groupName,
           userAvatar: res.data.target.doctorAvatar,
           positionName: res.data.target.positionName,
-          userIntro: res.data.target.doctorDesc
+          userIntro: desc
         };
-        var type = res.data.targetType;
         if (type > 3) {
           _this2.bg = '/static/index/bg.png';
         } else {

unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view class="container data-v-57280228"><view class="doctor-info data-v-57280228" style="{{'background-image:'+('url('+bg+')')+';'}}"><view class="user data-v-57280228"><view class="info data-v-57280228"><view class="name data-v-57280228">{{user.userName}}</view><view class="group data-v-57280228">{{user.groupName}}</view><view class="ocName data-v-57280228">{{user.ocName||user.positionName}}</view></view><block wx:if="{{user.type<4}}"><image class="avatar radius data-v-57280228" src="/static/index/piont.png"></image></block><block wx:else><block wx:if="{{user.userAvatar}}"><image class="avatar data-v-57280228" src="{{user.userAvatar}}" data-event-opts="{{[['error',[['avatarError',['$event']]]]]}}" binderror="__e"></image></block><block wx:else><image class="avatar data-v-57280228" src="{{defAvatar}}"></image></block></block></view><block wx:if="{{user.userIntro}}"><view class="introduce data-v-57280228">{{user.userIntro}}</view></block></view><view class="app-container data-v-57280228"><view class="app-title data-v-57280228">常规操作</view><view class="app-list data-v-57280228"><block wx:for="{{actionList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handle',['$0'],[[['actionList','',index]]]]]]]}}" class="app-item data-v-57280228" bindtap="__e"><image class="logo data-v-57280228" src="{{item.miniLogo}}"></image><view class="app-cont data-v-57280228"><view class="name data-v-57280228">{{item.miniTitle}}</view><block wx:if="{{item.miniDesc}}"><view class="desc data-v-57280228">{{item.miniDesc}}</view></block></view></view></block></view></view></view>
+<view class="container data-v-57280228"><view class="doctor-info data-v-57280228"><image class="bg data-v-57280228" src="{{bg}}"></image><view class="user data-v-57280228"><view class="info data-v-57280228"><view class="name data-v-57280228">{{user.userName}}</view><view class="group data-v-57280228">{{user.groupName}}</view><view class="ocName data-v-57280228">{{user.ocName||user.positionName}}</view></view><block wx:if="{{user.type<4}}"><image class="avatar radius data-v-57280228" src="/static/index/piont.png"></image></block><block wx:else><block wx:if="{{user.userAvatar}}"><image class="avatar data-v-57280228" src="{{user.userAvatar}}" data-event-opts="{{[['error',[['avatarError',['$event']]]]]}}" binderror="__e"></image></block><block wx:else><image class="avatar data-v-57280228" src="{{defAvatar}}"></image></block></block></view><block wx:if="{{user.userIntro}}"><view class="introduce data-v-57280228">{{user.userIntro}}</view></block></view><view class="app-container data-v-57280228"><view class="app-title data-v-57280228">常规操作</view><view class="app-list data-v-57280228"><block wx:for="{{actionList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handle',['$0'],[[['actionList','',index]]]]]]]}}" class="app-item data-v-57280228" bindtap="__e"><image class="logo data-v-57280228" src="{{item.miniLogo}}"></image><view class="app-cont data-v-57280228"><view class="name data-v-57280228">{{item.miniTitle}}</view><block wx:if="{{item.miniDesc}}"><view class="desc data-v-57280228">{{item.miniDesc}}</view></block></view></view></block></view></view></view>

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -39,6 +39,16 @@
   padding: 30rpx 48rpx 48rpx 48rpx;
   box-sizing: border-box;
   color: #fff;
+  position: relative;
+}
+.container .doctor-info .bg.data-v-57280228 {
+  display: block;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: -1;
 }
 .container .doctor-info .user.data-v-57280228 {
   display: flex;

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -22,7 +22,7 @@
         {
           "name": "网格",
           "pathName": "pages/index/index",
-          "query": "ocId=411119&code=6870174ced2e4ec0",
+          "query": "ocId=406283&code=b00877bd39684104",
           "launchMode": "default",
           "scene": null
         },
@@ -39,6 +39,13 @@
           "query": "ocId=406283&code=7e520df7e1824892",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "设备",
+          "pathName": "pages/index/index",
+          "query": "ocId=406283&code=18d71f6d5bfe4483",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }