Browse Source

no message

DESKTOP-70VPDLK\Administrator 1 year ago
parent
commit
d6b33cc772

+ 2 - 2
.env.js

@@ -4,12 +4,12 @@ let version = __wxConfig.envVersion;
 if (__wxConfig.envVersion === 'release') {
 
     //生产环境
-    ENV_CONFIG = require('.env.trial.js');
+    ENV_CONFIG = require('.env.prod.js');
     ENV_CONFIG.isCanvas2d = true
 }  else {
 
     //开发环境
-    ENV_CONFIG = require('.env.trial.js');
+    ENV_CONFIG = require('.env.prod.js');
     ENV_CONFIG.isCanvas2d = false
 }
 //#endif

+ 2 - 1
page_task/identity_upload/add-identity.vue

@@ -112,6 +112,7 @@
 					},
 					success: (res) => {
 						if (res.tempFiles.length > 0) {
+              console.log(res.tempFiles)
 							res.tempFiles.forEach((tempFile) => {
 								txUploadFile(tempFile.tempFilePath).then((data) => {
 									if (!data) {
@@ -247,4 +248,4 @@
 		}
 
 	}
-</style>
+</style>

+ 4 - 0
page_task/task_details/module/third_party.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="text-color-333" style="position: relative;left: -15rpx;">
 		<view class="apply content p-30 sys-background-fff r-30" :style="{height}">
+
 			<view class="size-26" v-for="(item,index) in tripartite">
 				<view class="">
 					<view class="row-c">
@@ -59,15 +60,18 @@
 					</view>
 				</view>
 			</view>
+      <en-blank v-if="tripartite.length<=0" message="暂无担保信息~~"></en-blank>
 		</view>
 	</view>
 </template>
 
 <script>
 	import EnImage from "@/components/en-utils/en-image/en-image.vue";
+  import EnBlank from "@/components/en-utils/en-blank/en-blank.vue";
 
 	export default {
 		components: {
+      EnBlank,
 			EnImage
 		},
 		props: {

+ 39 - 21
page_task/task_details/task_details.vue

@@ -46,33 +46,38 @@
 		<view class="sys-list-background-color task-tabs-width page-env-160"
 			:style="{top:`${$tools.topHeight()+fixedHeight}px`}">
 			<view class="m-t20 swiper-box">
-				<z-swiper ref="zSwiper" v-model="list" :options="options" v-if="current === 1" @slideChange="onSwiper">
-					<z-swiper-item>
-						<Identity  ref="identity" class="identity swiper-item" :height="`${maxHeight-60}px`" :business="business"
-							:linkman="linkman" :client-key="clientKey" @onShowImg="onShowImg" :linkman-key="linkmanKey">
-						</Identity>
-					</z-swiper-item>
-					<z-swiper-item v-show="product.product_types.indexOf('3')>=0">
-						<Apply class="apply swiper-item" :height="`${maxHeight-60}px`" :apply-for="applyFor"
-							:applies-key="appliesKey" @onShowImg="onShowImg">
-						</Apply>
-					</z-swiper-item>
-					<z-swiper-item v-show="product.product_types.indexOf('4')>=0">
-						<ThirdParty class="third_party swiper-item" :height="`${maxHeight-60}px`" :tripartite="tripartite"
-							:tripartite-key="tripartiteKey" @onShowImg="onShowImg">
-						</ThirdParty>
+				<z-swiper ref="zSwiper" v-model="basicType" :options="options" v-if="current === 1" @slideChange="onSwiper">
+					<z-swiper-item v-for="itemType in basicType">
+            <view v-if="itemType==='1'">
+              <Identity  ref="identity" class="identity swiper-item" :height="`${maxHeight-60}px`" :business="business"
+                         :linkman="linkman" :client-key="clientKey" @onShowImg="onShowImg" :linkman-key="linkmanKey">
+              </Identity>
+            </view>
+            <view v-else-if="itemType==='3'">
+              <Apply class="apply swiper-item" :height="`${maxHeight-60}px`" :apply-for="applyFor"
+                     :applies-key="appliesKey" @onShowImg="onShowImg">
+              </Apply>
+            </view>
+            <view v-else-if="itemType==='4'">
+              <ThirdParty class="third_party swiper-item" :height="`${maxHeight-60}px`" :tripartite="tripartite"
+                          :tripartite-key="tripartiteKey" @onShowImg="onShowImg">
+              </ThirdParty>
+            </view>
 					</z-swiper-item>
+
 				</z-swiper>
 				<view class="" v-if="current === 2">
-					<z-swiper v-model="lists" :options="options" @slideChange="onCreditSwiper">
-						<z-swiper-item>
+					<z-swiper v-model="restType" :options="options" @slideChange="onCreditSwiper">
+						<z-swiper-item v-for="itemType in restType">
+              <view v-if="itemType==='2'">
 							<Property class="property swiper-item" :height="`${creditHeight-60}px`" :property-list="propertyList"
 								:property-key="propertyKey" @onShowImg="onShowImg">
 							</Property>
-						</z-swiper-item>
-						<z-swiper-item>
-							<credit-list class="credit_list swiper-item" :height="`${creditHeight-60}px`" :credit-data="credit"
-								:credit-key="creditKey" @onShowImg="onShowImg"></credit-list>
+              </view>
+              <view v-else-if="itemType==='6'">
+                <credit-list class="credit_list swiper-item" :height="`${creditHeight-60}px`" :credit-data="credit"
+                             :credit-key="creditKey" @onShowImg="onShowImg"></credit-list>
+              </view>
 						</z-swiper-item>
 					</z-swiper>
 				</view>
@@ -132,6 +137,7 @@
 	} from "@/api/task";
 	import EnSelect from "@/components/en-utils/en-select/en-select.vue";
 	import CreditList from "@/page_task/credit/credit.vue";
+  import {type} from "@/uni_modules/uni-forms/components/uni-forms/utils";
 
 	export default {
 		components: {
@@ -215,6 +221,8 @@
 				creditListHeight: 0,
 				maxHeight: '100%',
 				creditHeight: '100%',
+        basicType:['1'],
+        restType:['2'],
 			}
 		},
 		onLoad(data) {
@@ -231,6 +239,7 @@
 			}
 		},
 		methods: {
+      type,
       makingCall(phone){
         tools.makingCall(phone)
       },
@@ -391,6 +400,14 @@
 					this.stageData = res.data.stageData
 					this.isExecute = res.data.isExecute
 					this.businessFile = res.data.businessFile
+          this.product.product_types.forEach(itemType=>{
+            if(itemType==='3' || itemType==='4'){
+              this.basicType.push(itemType)
+            }
+            if(itemType==='6'){
+              this.restType.push(itemType)
+            }
+          })
 					this.$refs.recordObj.startData()
 					this.$refs.zSwiper.swiper
 					this.getDetailsHeight()
@@ -546,6 +563,7 @@
 <style lang="scss" scoped>
 
 .swiper-box{
+  overflow: hidden;
   .swiper-item{
     transition: .5s ease;
   }

+ 3 - 1
service/txOssSts.js

@@ -64,7 +64,7 @@ function txUploadFile(file){
         cos.postObject({
             Bucket: Bucket,
             Region: Region,
-            Key: '/app-serve/'+tools.getDate()+'/'+tools.getRandFileName(file),
+            Key: '/app-serve/'+tools.getDate('-')+'/'+tools.getRandFileName(file),
             FilePath: file,
             onHashProgress: function (progressData) {
                 console.log('校验中', JSON.stringify(progressData));
@@ -74,6 +74,8 @@ function txUploadFile(file){
             },
         }, function (err, data) {
             tools.hideLoading()
+            console.log(err)
+            console.log(data)
             if(data.Location!==undefined){
                 let suffixArr = ['.pdf', '.doc', '.docx', '.xlsx', '.xls','.mp4']
                 let suffix = data.Location.substring(data.Location.lastIndexOf("."));