个人信息修改，工资页面修改-0116

commons/style.css

@@ -977,7 +977,8 @@ page{
 
 /* 工资记录 */
 .sign-record .info-other{
-	width: 150rpx;
+	width: auto;
+	max-width: 50%;
 }
 .sign-record .wages-info{
 	text-align: right;

pages/director/expenditure/expenditure.vue

@@ -49,7 +49,8 @@
 			<view class="sign-record sign-record-other bg-white">
 				<view class="item font26" v-for="(item,index) in payList" :key="index">
 					<view class="info info-other">
-						<text>{{item.name}}</text>
+						<text>姓名：{{item.name}}-{{item.date}}</text>
+						<text>月份：{{item.date}}</text>
 						<text class="color-66" v-if="item.status==2">部分发放：{{item.paid_amount}}元</text>
 						<text :class="item.status==0?'color-blue':'color-66'" v-else>{{item.status==0?'待发放':'已发放'}}</text>
 					</view>

pages/worker/sign/sign.vue

@@ -354,8 +354,23 @@
 			}
 			// 改变状态栏
 			this.changeStatusNav();
+			
+			// 判断用户类型
+			if(uni.getStorageSync('worker_role')!==0){
 				// 获取位置信息
 				this.getLocationEv(0);
+			}else{
+				// 判断是否查看安全公告
+				if(uni.getStorageSync('readSafeNotice')){
+					// 查询是否有通知
+					this.getNoticeInfo();
+				}else{
+					this.isRead = false;
+					// 获取安全告知
+					this.getSafetyBulletin();
+				}
+			}
+			
 			// 获取工作岗位
 			this.getPositionList();
 		},

pagesA/information/information.vue

@@ -69,11 +69,11 @@
 				</view>
 				<view class="item" v-if="userInfo.role==1">
 					<view class="title">身份证反面</view>
-					<view class="msg font24" @tap="changeImg('back')">
+					<view class="msg font24" @tap="changeImg('positive')">
 						<image :src="userInfo.id_back" mode="widthFix"></image>
-						<text class="director-arrow" v-if="userInfo.check_info.status==0 && userInfo.id_back!==userInfo.check_info.id_back">
+						<view class="director-arrow" v-if="userInfo.check_info.status==0 && userInfo.id_back!==userInfo.check_info.id_back">
 							<image :src="userInfo.check_info.id_back" mode="widthFix"></image>
-						</text>
+						</view>
 					</view>
 					<image src="/static/icon/icon-arrow-03.png" mode="aspectFit"></image>
 				</view>

project.config.json

@@ -1,77 +0,0 @@
-{
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": true,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "useIsolateContext": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false,
-    "ignoreUploadUnusedFiles": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.22.0",
-  "appid": "wx987dc41899f719e8",
-  "projectname": "%E4%BD%A9%E4%B8%BD%E5%95%86%E5%9F%8E",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "staticServerOptions": {
-    "baseURL": "",
-    "servePath": ""
-  },
-  "isGameTourist": false,
-  "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
-    }
-  }
-}

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -1092,7 +1092,8 @@ page{
 }
 /* 工资记录 */
 .sign-record .info-other{
-	width: 150rpx;
+	width: auto;
+	max-width: 50%;
 }
 .sign-record .wages-info{
 	text-align: right;

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

@@ -1524,7 +1524,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8878,7 +8878,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8899,14 +8899,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9002,7 +9002,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"工地打卡","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

unpackage/dist/dev/mp-weixin/pages/director/expenditure/expenditure.wxml

@@ -1 +1 @@
-<view class="pad-x120 data-v-578c57e5"><status-nav vue-id="cc01b47e-1" ifReturn="{{false}}" ifHome="{{true}}" navBarTitle="工地支出" class="data-v-578c57e5" bind:__l="__l"></status-nav><view class="content data-v-578c57e5" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="screen-box pay-screen-box data-v-578c57e5"><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="date" range="{{date}}" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['data-v-578c57e5',showDate==''?'color-99':'']}}">{{showDate!==''?$root.g0[0]+'年'+$root.g1[1]+'月':'请选择时间'}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="selector" range="{{cateList}}" value="{{cateIndex}}" data-event-opts="{{[['change',[['bindCateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['clips1','data-v-578c57e5',cateIndex==0?'color-99':'']}}">{{cateList[cateIndex]}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view></view><view class="pay-info font26 data-v-578c57e5"><view class="item font30 data-v-578c57e5"><text class="data-v-578c57e5">工资总金额</text><text class="data-v-578c57e5">{{"合计："+(payInfo.amount?payInfo.amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">基本工资</text><text class="data-v-578c57e5">{{(payInfo.base_amount?payInfo.base_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">加班工资</text><text class="data-v-578c57e5">{{(payInfo.overtime_amount?payInfo.overtime_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">待发工资</text><text class="data-v-578c57e5">{{(payInfo.not_amount?payInfo.not_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">已发工资</text><text class="data-v-578c57e5">{{(payInfo.done_amount?payInfo.done_amount:0)+"元"}}</text></view></view><view class="sign-record sign-record-other bg-white data-v-578c57e5"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-578c57e5"><view class="info info-other data-v-578c57e5"><text class="data-v-578c57e5">{{item.name}}</text><block wx:if="{{item.status==2}}"><text class="color-66 data-v-578c57e5">{{"部分发放："+item.paid_amount+"元"}}</text></block><block wx:else><text class="{{['data-v-578c57e5',item.status==0?'color-blue':'color-66']}}">{{item.status==0?'待发放':'已发放'}}</text></block></view><view class="wages-info data-v-578c57e5"><view class="text data-v-578c57e5">{{"基本工资："+item.base_amount+"元"}}</view><view class="text data-v-578c57e5">{{"加班工资："+item.overtime_amount+"元"}}</view><view class="text data-v-578c57e5">合计：<text class="font32 data-v-578c57e5">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-578c57e5">{{$root.g2==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="cc01b47e-2" userType="{{userType}}" current="1" class="data-v-578c57e5" bind:__l="__l"></tabbar></view>
+<view class="pad-x120 data-v-578c57e5"><status-nav vue-id="cc01b47e-1" ifReturn="{{false}}" ifHome="{{true}}" navBarTitle="工地支出" class="data-v-578c57e5" bind:__l="__l"></status-nav><view class="content data-v-578c57e5" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="screen-box pay-screen-box data-v-578c57e5"><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="date" range="{{date}}" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['data-v-578c57e5',showDate==''?'color-99':'']}}">{{showDate!==''?$root.g0[0]+'年'+$root.g1[1]+'月':'请选择时间'}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="selector" range="{{cateList}}" value="{{cateIndex}}" data-event-opts="{{[['change',[['bindCateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['clips1','data-v-578c57e5',cateIndex==0?'color-99':'']}}">{{cateList[cateIndex]}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view></view><view class="pay-info font26 data-v-578c57e5"><view class="item font30 data-v-578c57e5"><text class="data-v-578c57e5">工资总金额</text><text class="data-v-578c57e5">{{"合计："+(payInfo.amount?payInfo.amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">基本工资</text><text class="data-v-578c57e5">{{(payInfo.base_amount?payInfo.base_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">加班工资</text><text class="data-v-578c57e5">{{(payInfo.overtime_amount?payInfo.overtime_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">待发工资</text><text class="data-v-578c57e5">{{(payInfo.not_amount?payInfo.not_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">已发工资</text><text class="data-v-578c57e5">{{(payInfo.done_amount?payInfo.done_amount:0)+"元"}}</text></view></view><view class="sign-record sign-record-other bg-white data-v-578c57e5"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-578c57e5"><view class="info info-other data-v-578c57e5"><text class="data-v-578c57e5">{{"姓名："+item.name+"-"+item.date}}</text><text class="data-v-578c57e5">{{"月份："+item.date}}</text><block wx:if="{{item.status==2}}"><text class="color-66 data-v-578c57e5">{{"部分发放："+item.paid_amount+"元"}}</text></block><block wx:else><text class="{{['data-v-578c57e5',item.status==0?'color-blue':'color-66']}}">{{item.status==0?'待发放':'已发放'}}</text></block></view><view class="wages-info data-v-578c57e5"><view class="text data-v-578c57e5">{{"基本工资："+item.base_amount+"元"}}</view><view class="text data-v-578c57e5">{{"加班工资："+item.overtime_amount+"元"}}</view><view class="text data-v-578c57e5">合计：<text class="font32 data-v-578c57e5">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-578c57e5">{{$root.g2==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="cc01b47e-2" userType="{{userType}}" current="1" class="data-v-578c57e5" bind:__l="__l"></tabbar></view>

unpackage/dist/dev/mp-weixin/pages/worker/sign/sign.js

@@ -338,8 +338,23 @@ var _default = {
     }
     // 改变状态栏
     this.changeStatusNav();
+
+    // 判断用户类型
+    if (uni.getStorageSync('worker_role') !== 0) {
       // 获取位置信息
       this.getLocationEv(0);
+    } else {
+      // 判断是否查看安全公告
+      if (uni.getStorageSync('readSafeNotice')) {
+        // 查询是否有通知
+        this.getNoticeInfo();
+      } else {
+        this.isRead = false;
+        // 获取安全告知
+        this.getSafetyBulletin();
+      }
+    }
+
     // 获取工作岗位
     this.getPositionList();
   },

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

@@ -1,69 +1,50 @@
 {
-  "description": "项目配置文件",
+  "description": "项目配置文件。",
   "packOptions": {
     "ignore": [],
     "include": []
   },
   "setting": {
     "urlCheck": true,
-    "es6": true,
+    "es6": false,
-    "enhance": true,
+    "postcss": false,
-    "postcss": true,
-    "preloadBackgroundData": false,
     "minified": true,
-    "newFeature": false,
+    "newFeature": true,
-    "coverView": true,
+    "bigPackageSizeSupport": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "useIsolateContext": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false,
     "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.22.0",
+  "libVersion": "",
   "appid": "wxcd693ca907f801b3",
-  "projectname": "%E4%BD%A9%E4%B8%BD%E5%95%86%E5%9F%8E",
+  "projectname": "工地打卡",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
-      "list": []
+      "current": -1,
-    },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
       "list": []
     },
     "miniprogram": {
-      "list": []
+      "current": 0,
+      "list": [
+        {
+          "name": "",
+          "path": "",
+          "query": "",
+          "id": 0
+        }
+      ]
     }
   },
   "editorSetting": {