部分bug修复

client_mp/.gitignore

@@ -1,3 +1,4 @@
 node_modules/*
 deploy.sh
 package-lock.json
+unpackage/*

client_mp/App.vue

@@ -15,6 +15,10 @@
 			 */
 			this.$u.api.getUserInfo().then(res=>{
 				this.$u.vuex('vuex_user', res.data)
+			}).catch(e=>{
+				uni.reLaunch({
+					url:'/pages/login/login'
+				})
 			})
 		},
 	}

client_mp/common/http.interceptor.js

@@ -47,10 +47,9 @@ const install = (Vue, vm) => {
 		} 
 		else if(res.code === 401){
 				vm.$u.toast('验证失败，请重新登录');
-				setTimeout(() => {
-					// 此为uView的方法，详见路由相关文档
-					vm.$u.route('/pages/login/login')
-				}, 1500)
+				// uni.reLaunch({
+				// 	url:'/pages/login/login'
+				// })
 				return false;
 			}
 		else{ 

client_mp/manifest.json

@@ -30,7 +30,6 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
@@ -45,7 +44,6 @@
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
@@ -60,7 +58,8 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-                ]
+                ],
+                "autoSdkPermissions" : true
             },
             /* ios打包配置 */
             "ios" : {
@@ -70,7 +69,8 @@
             "sdkConfigs" : {
                 "speech" : {
                     "ifly" : {}
-                }
+                },
+                "ad" : {}
             },
             "orientation" : [ "portrait-primary" ]
         }
@@ -82,7 +82,7 @@
         "appid" : "wx126bdbf0c683c357",
         "setting" : {
             "urlCheck" : false,
-            "minified" : false
+            "minified" : true
         },
         "usingComponents" : true
     },

client_mp/pages/home/home.vue

@@ -18,7 +18,7 @@
 			@body-click="taskClick" :index="item.id" padding="10">
 			<view class="" slot="body">
 				<view class="u-body-item-title">
-					<span style="color:blue;border:1rpx solid blue;margin-right:6rpx">{{item.state}}</span>
+					<span style="color:#2979FF;font-weight: bold;margin-right: 8rpx;">{{item.state}}</span>
 					{{item.name}}
 				</view>
 				<view class="u-body-item">
@@ -105,7 +105,11 @@
 					state: '执行中'
 				}).then(res => {
 					this.myinspecttaskList = res.data
-				}).catch(e => {})
+				}).catch(e => {
+					uni.reLaunch({
+						url:'/pages/login/login'
+					})
+				})
 			},
 			openPage(path) {
 				this.$u.route({

client_mp/pages/inspectrecord/index.vue

@@ -1,10 +1,10 @@
 <template>
-	<view>
+	<view class="wrap">
 		<u-card :title="initData.dept__name" margin="6rpx" :border="false" :foot-border-top="false" border-radius="2rpx"
 			:head-style="headstyle" padding="10">
 			<view class="" slot="body">
 				<view class="u-body-item-title">
-					<span style="color:blue;border:1rpx solid blue;margin-right:6rpx">{{initData.state}}</span>
+					<span style="color:#2979FF;font-weight: bold;margin-right: 8rpx;">{{initData.state}}</span>
 				</view>
 			</view>
 			<view class="" slot="foot">
@@ -20,7 +20,7 @@
 			<u-section title="详细项目" :right="false"></u-section>
 		</view>
 		<view style="background-color: #ffffff;padding: 8rpx;">
-			<u-subsection :list="list" :current="currentIndex" @change="sectionChange"></u-subsection>
+			<u-tabs :list="list" :is-scroll="false" :current="currentIndex" @change="sectionChange"></u-tabs>
 <!-- 			<u-card v-for="(item, index) in records" v-bind:key="index"  margin="6rpx"
 				:border="false" :foot-border-top="false" border-radius="2rpx" :head-style="headstyle"
 				@body-click="clickRow" :index="item.id" padding="10" v-if="getShow(item.checked)">
@@ -42,7 +42,7 @@
 			style="padding: 12rpx;">
 			<view class="u-body-item-title">{{item.item_.sortnum}}.{{item.item_.name}}</view>
 			<view class="u-body-item">
-				<span>{{item.checker_.name}}</span>--
+				<span v-if="item.checker_">{{item.checker_.name}}</span>--
 				<span v-if="item.result=='发现'" style="color:red">{{item.result}}</span>
 				<span v-else-if="item.result=='未发现'" style="color:green">{{item.result}}</span>
 				<span v-else-if="item.result=='不适用'">{{item.result}}</span>

client_mp/pages/inspectrecord/recorddetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="padding-left: 16rpx;padding-right: 16rpx;padding-bottom: 16rpx;">
+	<view style="padding-left: 24rpx;padding-right: 24rpx;padding-bottom: 16rpx;">
 		<u-form :model="form" label-position="top" :label-style="labelStyle" ref="uForm" :rules="rules"
 			:errorType="errorType">
 			<u-form-item label="检查事项">

client_mp/pages/inspectrecord/recorddo.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="padding-left: 16rpx;padding-right: 16rpx;padding-bottom: 16rpx;">
+	<view style="padding-left: 24rpx;padding-right: 24rpx;padding-bottom: 16rpx;">
 		<u-form :model="form" label-position="top" :label-style="labelStyle" ref="uForm" :rules="rules"
 			:errorType="errorType">
 			<u-form-item label="检查事项">

client_mp/pages/login/login.vue

@@ -20,7 +20,7 @@
 		</view>
 		<u-verification-code seconds="30" ref="uCode" @change="codeChange"></u-verification-code>
 		<view class="buttom">
-			<view class="loginType">
+			<!-- <view class="loginType">
 				<view class="wechat item">
 					<view class="icon"><u-icon size="70" name="weixin-fill" color="rgb(83,194,64)"></u-icon></view>
 					微信
@@ -29,7 +29,7 @@
 					<view class="icon"><u-icon size="70" name="qq-fill" color="rgb(17,183,233)"></u-icon></view>
 					QQ
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>

client_mp/pages/subtask/my.vue

@@ -5,7 +5,7 @@
 			@body-click="taskClick" :index="item.id">
 			<view class="" slot="body">
 				<view class="u-body-item-title">
-					<span style="color:blue;border:1rpx solid blue;margin-right:6rpx">{{item.state}}</span>
+					<span style="color:#2979FF;font-weight: bold;margin-right: 8rpx;">{{item.state}}</span>
 					{{item.name}}
 				</view>
 				<view class="u-body-item">

client_mp/pages/subtask/subtaskdetail.vue

@@ -1,10 +1,10 @@
 <template>
-	<view>
+	<view class="wrap">
 		<u-card :title="subtask.name" margin="6rpx" :border="false" :foot-border-top="false" border-radius="2rpx"
 			:head-style="headstyle" padding="10">
 			<view class="" slot="body">
 				<view class="u-body-item-title">
-					<span style="color:blue;border:1rpx solid blue;margin-right:6rpx">{{subtask.state}}</span>
+					<span style="color:#2979FF;font-weight: bold;margin-right: 4rpx;">{{subtask.state}}</span>
 					{{subtask.name}}
 				</view>
 				<view class="u-body-item">
@@ -40,7 +40,8 @@
 			</view>
 		</u-card>
 		<view style="background-color: #ffffff;padding: 8rpx 4rpx 0rpx 4rpx;">
-			<u-subsection :list="list" :current="currentIndex" @change="sectionChange"></u-subsection>
+			<!-- <u-subsection :list="list" :current="currentIndex" @change="sectionChange"></u-subsection> -->
+			<u-tabs :list="list" :is-scroll="false" :current="currentIndex" @change="sectionChange"></u-tabs>
 			<u-cell-group v-if="nowdepts.length>0">
 				<u-cell-item v-for="(item, index) in nowdepts" v-bind:key="index" :title="item.dept__name" :arrow="true"
 					@click="cellClick(item)"></u-cell-item>
@@ -113,9 +114,9 @@
 		background-color: #ededed;
 	}
 
-	.u-cell {
+	/* .u-cell {
 		padding: 12rpx 24rpx !important;
-	}
+	} */
 </style>
 <style lang="scss" scoped>
 	.u-body-item-title {

client_mp/store/index.js

@@ -33,9 +33,14 @@ const store = new Vuex.Store({
 		// 加上vuex_前缀，是防止变量名冲突，也让人一目了然
 		vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {},
 		vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
-		vuex_host: 'http://127.0.0.1:8000',
-		vuex_api: 'http://127.0.0.1:8000/api',
-		vuex_apifile: 'http://127.0.0.1:8000/api/file/'
+		// vuex_host: 'http://127.0.0.1:8000',
+		// vuex_api: 'http://127.0.0.1:8000/api',
+		// vuex_apifile: 'http://127.0.0.1:8000/api/file/',
+		
+		vuex_host: 'http://testsearch.ctc.ac.cn',
+		vuex_api: 'http://testsearch.ctc.ac.cn:8000/api',
+		vuex_apifile: 'http://testsearch.ctc.ac.cn:8000/api/file/',
+		
 		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
 		// vuex_version: '1.0.1',
 		// vuex_demo: '绛紫',

client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

client_mp/unpackage/resources/__UNI__01C03DB/www/app-config.js

@@ -1 +0,0 @@
-(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

client_mp/unpackage/resources/__UNI__01C03DB/www/manifest.json

@@ -1 +0,0 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__01C03DB","name":"client_mp","version":{"name":"1.8.2","code":"100"},"description":"多平台快速开发的UI框架","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#FFFFFF"},"optimization":{"subPackages":true},"safearea":{"bottom":{"offset":"none"}},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"2.9.8","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#909399","selectedColor":"#303133","backgroundColor":"#FFFFFF","borderStyle":"rgba(0,0,0,0.4)","list":[{"pagePath":"pages/home/home","iconPath":"static/uview/example/component.png","selectedIconPath":"static/uview/example/component_select.png","text":"主页"},{"pagePath":"pages/uview/uview","iconPath":"static/uview/example/js.png","selectedIconPath":"static/uview/example/js_select.png","text":"uview"},{"pagePath":"pages/my/my","iconPath":"static/uview/example/template.png","selectedIconPath":"static/uview/example/template_select.png","text":"我的"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}