gjy 2 years ago
parent
commit
a9b0c9eced
3 changed files with 29 additions and 26 deletions
  1. 24 22
      .hbuilderx/launch.json
  2. 3 2
      config/index.js
  3. 2 2
      pages/task/audit/universalityAudit.vue

+ 24 - 22
.hbuilderx/launch.json

@@ -1,24 +1,26 @@
-{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "remote"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "remote"
-     	},
-     	"h5" : 
-     	{
-     		"launchtype" : "remote"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "remote"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "remote"
+            },
+            "h5" : {
+                "launchtype" : "remote"
+            },
+            "mp-weixin" : {
+                "launchtype" : "remote"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

+ 3 - 2
config/index.js

@@ -4,11 +4,12 @@ const dev = {
 	// 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/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// 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
 }

+ 2 - 2
pages/task/audit/universalityAudit.vue

@@ -9,7 +9,7 @@
 						<image src="../../../static/img/tongguo.png" mode="" v-if="dataobj.status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
 						<!-- v-if="status == '审核中' || status == '待决策人审核'" -->
-						<image src="../../../static/img/daishenhe.png" mode="" style="height: 40rpx;"></image>
+						<image v-if='dataobj.approveStatus' src="../../../static/img/daishenhe.png" mode="" style="height: 40rpx;"></image>
 						<!-- 待审核 -->
 					</view>
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
@@ -24,7 +24,7 @@
 				<u-form-item :border-bottom='false' :label-position='"top"' label="备注">
 					<view class="u-textarea-style">
 						<view class="right-bottom">
-							{{dataobj.remark.length}}/2000个字
+							{{dataobj.remark?dataobj.remark.length:0}}/2000个字
 						</view>
 						<textarea style='font-size:12px;' disabled maxlength="2000" v-model='dataobj.remark' placeholder="请输入备注信息" name="" id="" cols="30" rows="11"></textarea>
 					</view>