Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

App.vue

@@ -55,7 +55,7 @@ export default {
 				if (uni.getStorageSync("apply-token")) {
 					that.checkNum();
 				}
-			}, 1 * 30 * 1000);
+			}, 30 * 1000);
 		}
 
 		uni.$on("isGlogin", function (data) {
@@ -69,7 +69,13 @@ export default {
 			// that.initWyyx()
 		}
 	},
-	onHide: function () {},
+	onHide: function () {
+    if (this.globalData.timer) {
+        clearInterval(this.globalData.timer);
+        this.globalData.timer = null;
+        console.log("定时任务已清除");
+    }
+  },
 	methods: {
 		initWyyx() {
 			let that = this;

README.md

@@ -0,0 +1,6 @@
+# 报名助手
+
+```
+段后注释文本
+上8，#999，左对齐，14px
+```

root/bind/myMain.vue

@@ -69,7 +69,7 @@
 		</view>
 		<!-- #endif -->
 
-		<view v-if="allowClick">
+		<view v-if="allowClick && false">
 			<view class="g_h_100"></view>
 			<g-panel-fixed>
 				<slot>

root/detail/userShare.vue

@@ -96,14 +96,24 @@
 			</div>
 		</div>
 		<!-- 发布职位确认框 -->
-		<u-modal v-model="submitConfirm" width="90%" negativeTop="52" confirmText="发布职位" :showTitle="false" :confirmStyle="{ color: '#576b95', 'font-weight': 600 }" :cancelStyle="{ color: '#000', 'font-weight': 600 }" :showConfirmButton="false">
+		<u-modal v-model="submitConfirm" 
+							width="90%" 
+							negativeTop="52" 
+							confirmText="发布职位" 
+							:showTitle="false" 
+					   :confirmStyle="{ color: '#576b95', 'font-weight': 600 }" 
+						 :cancelStyle="{ color: '#000', 'font-weight': 600 }" 
+						 :showConfirmButton="false"
+						 :negative-top="20"
+		>
 			<div class="g_fs_17 g_text_c">
 				<div class style="padding: 42px 24px 36px">
 					<div class="g_text_c g_fw_600 g_c_0">创建团队/企业</div>
-					<div class="g_text_c g_c_6 g_mb_16 g_mt_16">创建团队后可关注发单号，浏览职位及工单报名</div>
+					<div class="g_text_l g_c_6 g_mb_8 g_mt_24 g_pl_12">团队名称/企业简称：</div>
 					<div class="g_fs_14 g_pl_12 g_bg_f2 g_border_d g_radius_4 g_flex_row_start flex_center">
-						<u-input v-model="agencyInfo.fullName" :customStyle="{ color: disabled ? '#999' : '#333', fontSize: '17px' }" :disabled="disabled" height="96" placeholder="请填写团队/企业简称"></u-input>
+						<u-input v-model="agencyInfo.fullName" :customStyle="{ color: disabled ? '#999' : '#333', fontSize: '17px' }" :disabled="disabled" height="96" placeholder="如：上海发财劳务"></u-input>
 					</div>
+					<div class="g_text_l g_c_9 g_mt_8 g_fs_14 g_pl_12">创建团队后可关注发单号，浏览职位及工单报名。</div>
 				</div>
 				<div class="g_flex_row_center flex_center g_fw_600 g_border_e_t">
 					<div class="g_flex_1 g_h_50 g_text_c g_c_0 g_border_e_r" hover-class="thover" @click="submitConfirm = false" style="line-height: 50px">取消</div>

root/person/set.vue

@@ -19,7 +19,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="g_fs_14 g_mt_4 g_pl_10 g_c_9"> 关闭后，首页收到的发单号邀请不再主动弹出 </view>
+			<view class="g_fs_14 g_mt_8 g_pl_20 g_c_9"> 关闭后，首页收到的发单号邀请不再主动弹出 </view>
 		</view>
 		<g-panel-form-item
 			:list="[

root/person/teamManage.vue

@@ -26,7 +26,7 @@
 					</div>
 					<div class="g_h_40"></div>
 				</div>
-				<g-panel-fixed>
+				<g-panel-fixed v-if="false">
 					<div class="g_flex_row_center">
 						<div class="g_w_200 g_mr_20">
 							<g-button btnText="手动添加" size="auto" @clickBtn="goPage('/root/person/addOrUpdataMember')"></g-button>

utils/ajax.js

@@ -116,6 +116,7 @@ let data = {
         // console.log('测试报错123123123123123123',res);
         // console.log('测试报错123123123123123123$url',$url);
         let resData = res.data;
+		
         if (resData.status == 200) {// 正常
           callback(resData.data, resData.msg);
         } else if (resData.status == 9999) {// 登录过期或者身份变动等需要登录的场景
@@ -137,6 +138,7 @@ let data = {
           // } else {
           uni.showToast({
             title: resData.msg,
+			// title:'系统异常，请稍后',
             icon: "none"
           });
           failback(resData.msg);
@@ -167,7 +169,8 @@ let data = {
       },
       fail (error) {
         uni.showToast({
-          title: error.errMsg,
+          // title: error.errMsg,
+		  title:'系统异常，请稍后',
           icon: "none"
         })
         failback(error);