更新

App.vue

@@ -2,6 +2,15 @@
   export default {
     onLaunch: function() {
       console.log('App Launch')
+      try{
+        if(!this.$store.state.app.token)uni.redirectTo({
+          url: '/pages/oaLogin/oaLogin'
+        })
+      }catch(e){
+        uni.redirectTo({
+          url: '/pages/oaLogin/oaLogin'
+        })
+      }
     },
     onShow: function() {
       console.log('App Show')

components/company/company.vue

@@ -69,7 +69,8 @@
         <view class="card">
           <view class="one">
             <view class="linkman">
-              <view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;"></view>
+              <view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;">
+              </view>
               主要联系人
             </view>
             <view class="info">
@@ -83,7 +84,9 @@
           <view class="one" v-for="(other, index) in company.other_contacts" :key="index">
             <block v-if="other.name!=''">
               <view class="linkman">
-                <view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;"></view>
+                <view
+                  style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;">
+                </view>
                 其他联系人
               </view>
               <view class="info">
@@ -104,25 +107,27 @@
         <view class="title">资质信息</view>
         <view class="image_box" style="background-color: #fff;border-radius: 7px 7px 7px 7px;">
           <u--image class="image" @click="priview(company.qualification.business_license)"
-            :src="company.qualification.business_license" v-if="company.qualification.business_license" :lazy-load="true">
+            :src="company.qualification.business_license" v-if="company.qualification.business_license"
+            :lazy-load="true">
             <template v-slot:loading>
               <u-loading-icon color="#333"></u-loading-icon>
             </template>
           </u--image>
           <u--image class="image" @click="priview(company.qualification.business_licenseB)"
-            :src="company.qualification.business_licenseB" v-if="company.qualification.business_licenseB" :lazy-load="true">
+            :src="company.qualification.business_licenseB" v-if="company.qualification.business_licenseB"
+            :lazy-load="true">
             <template v-slot:loading>
               <u-loading-icon color="#333"></u-loading-icon>
             </template>
           </u--image>
-          <u--image class="image" @click="priview(company.qualification.bank_account)"
+          <u--image class="image" v-for="item in company.qualification.bank_account" :key="item" @click="priview(item)"
-            :src="company.qualification.bank_account" v-if="company.qualification.bank_account" :lazy-load="true">
+            :src="item" v-if="company.qualification.bank_account" :lazy-load="true">
             <template v-slot:loading>
               <u-loading-icon color="#333"></u-loading-icon>
             </template>
           </u--image>
-          <u--image class="image" @click="priview(company.qualification.bank_accountB)"
+          <u--image class="image" v-for="item in company.qualification.bank_accountB" :key="item" @click="priview(item)"
-            :src="company.qualification.bank_accountB" v-if="company.qualification.bank_accountB" :lazy-load="true">
+            :src="item" v-if="company.qualification.bank_accountB" :lazy-load="true">
             <template v-slot:loading>
               <u-loading-icon color="#333"></u-loading-icon>
             </template>
@@ -189,6 +194,13 @@
 
         }
         this.company = res.data.company;
+        try{
+          if(Array.isArray(JSON.parse(this.company.qualification.bank_account))){
+            this.company.qualification.bank_account = JSON.parse(this.company.qualification.bank_account)
+          }
+        }catch(e){
+          
+        }
         uni.$emit('companyInfo', this.company); //发送全局事件
         this.user = res.data.user;
         this.contract = res.data.contract;
@@ -312,6 +324,7 @@
         .left {
           display: flex;
           align-items: center;
+
           .location {
             margin-left: 8rpx;
           }
@@ -411,6 +424,7 @@
         border-radius: 20rpx;
         overflow: hidden;
         margin-bottom: 28rpx;
+
         image {
           width: 650rpx;
           height: 455rpx;

pages.json

@@ -1,15 +1,6 @@
 {
   "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/oaLogin/oaLogin",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
 
-		},
     {
       "path": "pages/oaHome/oaHome",
       "style": {
@@ -20,6 +11,16 @@
         }
       }
     },
+    {
+      "path": "pages/oaLogin/oaLogin",
+      "style": {
+        "navigationBarTitleText": "登录",
+        "app-plus": {
+          "titleNView": false
+        }
+      }
+
+    },
     {
       "path": "pages/business/business",
       "style": {

pages/oaHome/oaHome.vue

@@ -337,7 +337,7 @@
     width: 100%;
     // background-color: $theme-oa-color;
     margin-bottom: 133.33rpx;
-    background-image: url('../../static/img/home/head-bg.png');
+    background-image: url('../../static/img/home/home_bg.png');
     background-repeat: no-repeat;
     background-size: 100% 100%;
 

pages/oaMy/oaMy.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="my">
     <view class="head_box">
-      <image class="head_img" src="../../static/img/home/head-bg.png"></image>
+      <!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
       <!-- #ifdef APP-PLUS||H5 -->
       <view style="height: var(--status-bar-height);"></view>
       <view style="height: 100rpx"></view>
@@ -34,10 +34,10 @@
               </view>
             </view>
           </view>
-          <view v-if="$store.state.app.token" class="compile" @click="naviTo()">
+          <!-- <view v-if="$store.state.app.token" class="compile" @click="naviTo()">
             <view class="iconfont icon-bianji"></view>
-            <!-- <view class="">编辑</view> -->
+            <view class="">编辑</view>
-          </view>
+          </view> -->
         </view>
         <view class="assess">
           <view class="ass_cent flex_a_c_j_sb">
@@ -173,15 +173,18 @@
       width: 100vw;
       padding-top: 30rpx;
       margin-bottom: 30rpx;
+      background-image: url('../../static/img/home/my_bg.png');
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
 
-      .head_img {
+      // .head_img {
-        position: absolute;
+      //   position: absolute;
-        // z-index: -1;
+      //   // z-index: -1;
-        width: 100%;
+      //   width: 100%;
-        height: 100%;
+      //   height: 100%;
-        top: 0;
+      //   top: 0;
-        left: 0;
+      //   left: 0;
-      }
+      // }
     }
 
   }
@@ -208,13 +211,13 @@
 
   .personage {
     // position: relative;
-    padding: 42.11rpx 0 28.07rpx 0;
+    padding-bottom: 28rpx;
     border-radius: 12px;
     // background-color: #fff;
     color: #fff;
-    width: 694.74rpx;
+    width: 694rpx;
     margin-left: 50%;
-    transform: translate(-50%, -43.86rpx);
+    transform: translate(-50%, -31.58rpx);
 
     .name_work {
       margin-left: 31.58rpx;

subpkg/companyInfo/companyInfo.vue

@@ -256,9 +256,11 @@
         .btn {
           font-size: 25rpx;
           font-weight: 400;
+          min-width: 80rpx;
           color: #666666;
           display: flex;
           align-items: center;
+          justify-content: right;
         }
       }
 

subpkg/companySign/companySign.vue

@@ -1,8 +1,9 @@
 <template>
   <view class="">
     <company :id="id" type="company"></company>
-    <view class="need_contract" v-if="!company.contract||!company.contract.status">
+    <view class="need_contract" v-if="!company.contract||!company.contract.status||!company.company.is_contract">
-      <picker v-if="!company.contract" :range="contractTypeList" range-key="name" @change="changeType">
+      <view class="title">电子合同</view>
+      <picker v-if="company.contract&&company.contract.check_status==0||!company.contract" :range="contractTypeList" range-key="name" @change="changeType">
         <button class="btn">生成合同</button>
         <!-- <mybtn text="生成合同" position="false"></mybtn> -->
       </picker>
@@ -103,20 +104,29 @@
       },
       // 生成合同
       async createContract(data) {
+        uni.showLoading({
+          title:'合同生成中',
+          mask: true
+        })
         let res = await initiateContract({
           party_b: data.party_b,
           contract_type: data.contract_type,
           type: data.type
         })
-        Toast(res.msg || '合同已生成')
+        // Toast(res.msg || '合同已生成')
         this.initCompany();
+        uni.hideLoading()
       },
       // 发送合同
       async addContract(data) {
+        uni.showLoading({
+          title:'合同发送中',
+          mask: true
+        })
         let res = await Draftingcontracts({
           id: this.id
         });
-        Toast('合同已发送');
+        // Toast('合同已发送');
         this.initCompany();
         if (this.userInfo.contract.check_status == 3) {
           this.timerCount = 60;
@@ -128,6 +138,7 @@
             }
           }, 1000);
         }
+        uni.hideLoading();
         this.naviTo('/subpkg/submit/submit');
       },
       // 发送短信
@@ -164,6 +175,13 @@
 <style lang="scss">
   .need_contract {
     padding-bottom: 30rpx;
+    .title{
+      font-size: 35rpx;
+      font-weight: 500;
+      color: #333333;
+      margin-bottom: 21rpx;
+      margin-left: 28rpx;
+    }
 
     .card {
       padding-top: 0;

subpkg/companyUnsign/companyUnsign.vue

@@ -163,9 +163,11 @@ export default {
         .btn {
           font-size: 25rpx;
           font-weight: 400;
+          min-width: 80rpx;
           color: #666666;
           display: flex;
           align-items: center;
+          justify-content: right;
         }
       }
 

subpkg/personnelDetails/personnelDetails.vue

@@ -135,7 +135,7 @@
 						</view>
 					</view>
 				</view>
-				<picker v-if="!userInfo.is_contract&&!userInfo.contract" :range="contractTypeList" range-key="name"
+				<picker v-if="!userInfo.is_contract&&!userInfo.contract||(userInfo.contract&&userInfo.contract.check_status==0)" :range="contractTypeList" range-key="name"
 					@change="changeType">
 					<button class="btn">生成合同</button>
 				</picker>
@@ -290,20 +290,29 @@
 			},
 			// 生成合同
 			async createContract(data) {
+        uni.showLoading({
+          title:'合同生成中',
+          mask: true
+        })
 				let res = await userInitiateContract({
 					party_b: data.party_b,
 					contract_type: data.contract_type,
 					type: data.type
 				})
-				Toast('合同已生成')
+				// Toast('合同已生成');
 				this.loadUserDetail();
+        uni.hideLoading();
 			},
 			// 发送合同
 			async addContract(data) {
+        uni.showLoading({
+          title:'合同发送中',
+          mask: true
+        })
 				let res = await userDraftingcontracts({
 					id: this.userInfo.id
 				});
-				Toast('合同已发送');
+				// Toast('合同已发送');
 				this.loadUserDetail();
 				if (this.userInfo.contract.check_status == 3) {
 					this.timerCount = 60;
@@ -315,6 +324,7 @@
 						}
 					}, 1000);
 				}
+        uni.hideLoading();
 				this.naviTo('/subpkg/submit/submit');
 			},
 			// 发送短信