style：修改页面样式问题

common/system_popup/system_popup.vue

@@ -4,15 +4,17 @@
 			<view class="column justify-center avatar r-100">
 				<view class="avatar r-100" style="background-color: rgba(0, 0, 0, 0.1);"></view>
 				<view class="row-c avatar_name m-l20">
-					<image class="wh-100 r-circle" v-if="!memberData.head_img" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-avatar.png"
+					<image class="wh-100 r-circle" v-if="!memberData.head_img"
+						src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-avatar.png"
 						mode="aspectFill"></image>
 					<image class="wh-100 r-circle" v-else :src="memberData.head_img" mode="aspectFill"></image>
-					<view class="column m-l20">
-						<view class="size-30 text-color-333">
+					<view class="column m-l20 flex">
+						<view class="size-30 text-color-333 ellipsis" style="width: 160rpx;">
 							{{ memberData.name ? memberData.name : memberData.nickname }}
 						</view>
-						<text
-							class="size-26 text-color-666">{{memberData.position_name?memberData.position_name:'无'}}</text>
+						<view class="size-26 text-color-666 ellipsis" style="width: 160rpx;">
+							{{memberData.position_name?memberData.position_name:'无'}}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -23,11 +25,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- 		<view class="system-quit size-28 button-color sys-weight-600" style="position: relative;">
-			<view class="system-quit button-text">
-				退出登录
-			</view>
-		</view> -->
 		<view class="system-button m-b50">
 			<view class="system-quit">
 			</view>
@@ -39,9 +36,11 @@
 </template>
 
 <script>
-	import {logout} from "@/api/user";
+	import {
+		logout
+	} from "@/api/user";
 
-  export default {
+	export default {
 		props: {
 			memberData: {
 				default: {
@@ -79,41 +78,40 @@
 		created() {
 			this.topNavHeight = getApp().globalData.topNavHeight
 		},
-    mounted() {
-    },
-    methods: {
+		mounted() {},
+		methods: {
 			moveHandle() {
 				return false
 			},
-      exitAccount() {
-        uni.showModal({
-          title: '提示',
-          content: '是否退出当前账户？',
-          success: (res) => {
-            if (res.confirm) {
-              logout()
-              uni.clearStorageSync()
-              uni.reLaunch({
-                url: `/pages/login/index`
-              })
-            }
-          }
-        });
-      },
+			exitAccount() {
+				uni.showModal({
+					title: '提示',
+					content: '是否退出当前账户？',
+					success: (res) => {
+						if (res.confirm) {
+							logout()
+							uni.clearStorageSync()
+							uni.reLaunch({
+								url: `/pages/login/index`
+							})
+						}
+					}
+				});
+			},
 			onGoSetting(item) {
 				if (item.id === 1) {
 					return uni.navigateTo({
 						url: `/page_subpack/personal_details/personal_details`
 					})
-				} else if(item.id===4){
-          // uni.navigateTo({
-          // 	url: `/page_subpack/system_setting/system_setting?id=${item.id}&title=${item.name}`
-          // })
-        }else {
-          uni.navigateTo({
-            url: `/page_subpack/system_setting/system_setting?id=${item.id}&title=${item.name}`
-          })
-        }
+				} else if (item.id === 4) {
+					// uni.navigateTo({
+					// 	url: `/page_subpack/system_setting/system_setting?id=${item.id}&title=${item.name}`
+					// })
+				} else {
+					uni.navigateTo({
+						url: `/page_subpack/system_setting/system_setting?id=${item.id}&title=${item.name}`
+					})
+				}
 
 			}
 		}
@@ -173,4 +171,4 @@
 		position: absolute;
 		top: 0;
 	}
-</style>
+</style>

components/en-from/en-upload/en-upload.vue

@@ -1,662 +1,671 @@
 <template>
-  <view class="con" :class="{'no-con':!showLabel}">
-    <view class="con-title" v-if="showLabel">{{label}}</view>
-    <movable-area class="area" :style="{ height: areaHeight }" @mouseenter="mouseenter" @mouseleave="mouseleave">
-      <block v-for="(item, index) in imageList" :key="item.id">
-        <movable-view class="view" :x="item.x" :y="item.y" direction="all" :damping="40" :disabled="item.disable"
-                      @change="onChange($event, item)" @touchstart="touchstart(item)" @mousedown="touchstart(item)"
-                      @touchend="touchend(item)" @mouseup="touchend(item)"
-                      :style="{ width: viewWidth + 'px', height: viewWidth + 'px', 'z-index': item.zIndex, opacity: item.opacity }">
-          <view class="area-con" @click.stop="examineImgOne(index)"
-                :style="{ width: childWidth, height: childWidth, transform: 'scale(' + item.scale + ')' }">
-            <image  class="pre-image" :src="item.src+(imgType===1?'':'?x-oss-process=video/snapshot,t_7000,f_jpg,w_600,h_0,m_fast')" mode="aspectFill"></image>
-            <text v-if="imgType===2" class="bf-img iconfont"> &#xea82;</text>
-            <view class="del-con" @click.stop="delImage(item, index)" @touchstart.stop="delImageMp(item, index)"
-                  @touchend.stop="nothing()" @mousedown.stop="nothing()" @mouseup.stop="nothing()">
-              <view class="del-wrap">
-<!--                <image class="del-image"-->
-<!--                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMDowNzoyNSAyMTo1NDoyOU4TkJAAAADcSURBVFhH7ZfRCoMwDEXLvkjwwVf/bH/emmAyN6glTW9WBjsgwm28OeCLpj81Sil7zvlJ90UiONS/yY5VogsO6XrBg3IEQ5a/s8vRSWUAKmLqp2w5jz5BiNQEGMo3GbloDLtFXJ1IkaEuhAiiY6gEIqB4yqACSk9piIBiKQ8VUFpLviKg3C2rESKgWERCBZSWiEfgIfffYvrrsAgoISJ3Apy3zuTxcSxLQkV6ykNEPKVQkZEyiAiiZKgDIaC4upACSlcn5fM/+WuDCAHF1E/Z/N9AhkMZnPNDPI+UDjPIXgAQIGjNAAAAAElFTkSuQmCC">-->
-<!--                </image>-->
-                <text  class="del-image iconfont"> &#xe603;</text>
-              </view>
-            </view>
-          </view>
-        </movable-view>
-      </block>
-      <view class="add" v-if="imageList.length < number"
-            :style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }" @click="showUploadingImg(true,0)">
-        <view class="add-wrap" :style="{ width: childWidth, height: childWidth }">
-          <view class="video-data">
-            <text class="video-img iconfont" >&#xe658;</text>
-          </view>
-        </view>
-      </view>
-      <uni-popup ref="popup" :safeArea="false" type="bottom" @change="closePopup">
-        <view class="popup-block">
-          <view class="popup-row" @click="selectMultimedia(1)">拍照</view>
-          <view class="popup-row" @click="selectMultimedia(2)">从手机里面选择</view>
-          <view class="popup-row" @click="showUploadingImg(false,0)">取消</view>
-        </view>
-      </uni-popup>
-    </movable-area>
-  </view>
+	<view class="con" :class="{'no-con':!showLabel}">
+		<view class="con-title" v-if="showLabel">{{label}}</view>
+		<movable-area class="area" :style="{ height: areaHeight }" @mouseenter="mouseenter" @mouseleave="mouseleave">
+			<block v-for="(item, index) in imageList" :key="item.id">
+				<movable-view class="view" :x="item.x" :y="item.y" direction="all" :damping="40"
+					:disabled="item.disable" @change="onChange($event, item)" @touchstart="touchstart(item)"
+					@mousedown="touchstart(item)" @touchend="touchend(item)" @mouseup="touchend(item)"
+					:style="{ width: viewWidth + 'px', height: viewWidth + 'px', 'z-index': item.zIndex, opacity: item.opacity }">
+					<view class="area-con" @click.stop="examineImgOne(index)"
+						:style="{ width: childWidth, height: childWidth, transform: 'scale(' + item.scale + ')' }">
+						<image class="pre-image"
+							:src="item.src+(imgType===1?'':'?x-oss-process=video/snapshot,t_7000,f_jpg,w_600,h_0,m_fast')"
+							mode="aspectFill"></image>
+						<text v-if="imgType===2" class="bf-img iconfont"> &#xea82;</text>
+						<view class="del-con" @click.stop="delImage(item, index)"
+							@touchstart.stop="delImageMp(item, index)" @touchend.stop="nothing()"
+							@mousedown.stop="nothing()" @mouseup.stop="nothing()">
+							<view class="del-wrap">
+								<!--                <image class="del-image"-->
+								<!--                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMDowNzoyNSAyMTo1NDoyOU4TkJAAAADcSURBVFhH7ZfRCoMwDEXLvkjwwVf/bH/emmAyN6glTW9WBjsgwm28OeCLpj81Sil7zvlJ90UiONS/yY5VogsO6XrBg3IEQ5a/s8vRSWUAKmLqp2w5jz5BiNQEGMo3GbloDLtFXJ1IkaEuhAiiY6gEIqB4yqACSk9piIBiKQ8VUFpLviKg3C2rESKgWERCBZSWiEfgIfffYvrrsAgoISJ3Apy3zuTxcSxLQkV6ykNEPKVQkZEyiAiiZKgDIaC4upACSlcn5fM/+WuDCAHF1E/Z/N9AhkMZnPNDPI+UDjPIXgAQIGjNAAAAAElFTkSuQmCC">-->
+								<!--                </image>-->
+								<text class="del-image iconfont"> &#xe603;</text>
+							</view>
+						</view>
+					</view>
+				</movable-view>
+			</block>
+			<view class="add" v-if="imageList.length < number"
+				:style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }"
+				@click="showUploadingImg(true,0)">
+				<view class="add-wrap" :style="{ width: childWidth, height: childWidth }">
+					<view class="video-data">
+						<text class="video-img iconfont">&#xe658;</text>
+					</view>
+				</view>
+			</view>
+			<uni-popup ref="popup" :safeArea="false" type="bottom" @change="closePopup">
+				<view class="popup-block">
+					<view class="popup-row" @click="selectMultimedia(1)">拍照</view>
+					<view class="popup-row" @click="selectMultimedia(2)">从手机里面选择</view>
+					<view class="popup-row" @click="showUploadingImg(false,0)">取消</view>
+				</view>
+			</uni-popup>
+		</movable-area>
+	</view>
 </template>
 
 <script>
+	import tools from "@/service/tools";
+	import txUploadFile from "@/service/txOssSts";
 
+	export default {
+		components: {
 
-import tools from "@/service/tools";
-import txUploadFile from "@/service/txOssSts";
+		},
+		data() {
+			return {
+				imageList: [],
+				previewList: [],
+				width: 0,
+				add: {
+					x: 0,
+					y: 0
+				},
+				current: 0,
+				colsValue: 0,
+				viewWidth: 0,
+				tempItem: null,
+				timer: null,
+				changeStatus: true,
+				preStatus: true,
+				ossClient: null,
+				isStart: true,
+				isUploading: false
+			}
+		},
+		props: {
+			value: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			showLabel: {
+				type: Boolean,
+				default: true
+			},
+			label: {
+				type: String,
+				default: '标题'
+			},
+			// 返回排序后图片
+			list: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			imgType: {
+				type: Number,
+				default: 1
+			},
+			fileNum: {
+				type: Number,
+				default: 9
+			},
+			// 选择图片数量限制
+			number: {
+				type: Number,
+				default: 100
+			},
+			// 图片父容器宽度（实际显示的图片宽度为 imageWidth / 1.1 ），单位 rpx
+			imageWidth: {
+				type: Number,
+				default: 180
+			},
+			// 图片列数（cols > 0 则 imageWidth 无效）
+			cols: {
+				type: Number,
+				default: 0
+			},
+			// 图片周围空白填充，单位 rpx
+			padding: {
+				type: Number,
+				default: 10
+			},
+			// 拖动图片时放大倍数 [0, ∞)
+			scale: {
+				type: Number,
+				default: 1.1
+			},
+			// 拖动图片时不透明度
+			opacity: {
+				type: Number,
+				default: 0.7
+			},
+			// 自定义添加（需配合 @aaddImage 事件使用）
+			custom: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			'value': function() {
+				this.startValue()
+			}
+		},
+		computed: {
+			areaHeight() {
+				if (this.imageList.length < this.number) {
+					return Math.ceil((this.imageList.length + 1) / this.colsValue) * this.viewWidth + 'px'
+				} else {
+					return Math.ceil(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+				}
+			},
+			childWidth() {
+				return this.viewWidth - this.rpx2px(this.padding) * 2 + 'px'
+			},
+		},
+		created() {
+			this.width = uni.getSystemInfoSync().windowWidth
+			this.viewWidth = this.rpx2px(this.imageWidth)
+		},
+		mounted() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select('.area').boundingClientRect(data => {
+				if (data) {
+					this.colsValue = Math.floor(data.width / this.viewWidth)
+					if (this.cols > 0) {
+						this.colsValue = this.cols
+						this.viewWidth = data.width / this.cols
+					}
+					for (let item of this.list) {
+						this.addProperties(item)
+					}
+				}
 
-export default {
-  components:{
+			})
+			query.exec()
+			this.startValue()
+		},
+		methods: {
+			showUploadingImg(showImg) {
+				if (showImg) {
+					if (this.isUploading) {
+						return
+					}
+					this.isUploading = true
+					this.$refs.popup.open("bottom");
+				} else {
+					this.$refs.popup.close();
+					this.isUploading = false
+				}
+			},
+			closePopup(e) {
+				if (e.show === false) {
+					this.isUploading = false
+				}
+			},
+			startValue() {
+				if (!this.isStart) {
+					return
+				}
+				if (this.value.length > 0) {
+					this.isStart = false
+					setTimeout(() => {
+						this.startList(this.value)
+					}, 100)
+				}
+			},
+			examineImgOne(index) {
+				// this.$emit('examineImgOne',index)
+				// this.previewList = this.list
+				// this.current = index
+				// this.$refs.previewImage.open(index);
+				let imgList = []
+				this.imageList.forEach((item) => {
+					console.log(item)
+					imgList.push(item.src)
+				})
+				uni.previewImage({
+					urls: imgList,
+					current: index,
+					success: () => {
 
-  },
-  data() {
-    return {
-      imageList: [],
-      previewList:[],
-      width: 0,
-      add: {
-        x: 0,
-        y: 0
-      },
-      current: 0,
-      colsValue: 0,
-      viewWidth: 0,
-      tempItem: null,
-      timer: null,
-      changeStatus: true,
-      preStatus: true,
-      ossClient:null,
-      isStart:true,
-      isUploading:false
-    }
-  },
-  props: {
-    value:{
-      type: Array,
-      default: function() {
-        return []
-      }
-    },
-    showLabel:{
-      type:Boolean,
-      default:true
-    },
-    label: {
-      type: String,
-      default: '标题'
-    },
-    // 返回排序后图片
-    list: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    },
-    imgType: {
-      type: Number,
-      default: 1
-    },
-    fileNum: {
-      type: Number,
-      default: 9
-    },
-    // 选择图片数量限制
-    number: {
-      type: Number,
-      default: 100
-    },
-    // 图片父容器宽度（实际显示的图片宽度为 imageWidth / 1.1 ），单位 rpx
-    imageWidth: {
-      type: Number,
-      default: 180
-    },
-    // 图片列数（cols > 0 则 imageWidth 无效）
-    cols: {
-      type: Number,
-      default: 0
-    },
-    // 图片周围空白填充，单位 rpx
-    padding: {
-      type: Number,
-      default: 10
-    },
-    // 拖动图片时放大倍数 [0, ∞)
-    scale: {
-      type: Number,
-      default: 1.1
-    },
-    // 拖动图片时不透明度
-    opacity: {
-      type: Number,
-      default: 0.7
-    },
-    // 自定义添加（需配合 @aaddImage 事件使用）
-    custom: {
-      type: Boolean,
-      default: false
-    }
-  },
-  watch:{
-    'value':function () {
-      this.startValue()
-    }
-  },
-  computed: {
-    areaHeight() {
-      if (this.imageList.length < this.number) {
-        return Math.ceil((this.imageList.length + 1) / this.colsValue) * this.viewWidth + 'px'
-      } else {
-        return Math.ceil(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
-      }
-    },
-    childWidth() {
-      return this.viewWidth - this.rpx2px(this.padding) * 2 + 'px'
-    },
-  },
-  created() {
-    this.width = uni.getSystemInfoSync().windowWidth
-    this.viewWidth = this.rpx2px(this.imageWidth)
-  },
-  mounted() {
-    const query = uni.createSelectorQuery().in(this)
-    query.select('.area').boundingClientRect(data => {
-      if(data){
-        this.colsValue = Math.floor(data.width / this.viewWidth)
-        if (this.cols > 0) {
-          this.colsValue = this.cols
-          this.viewWidth = data.width / this.cols
-        }
-        for (let item of this.list) {
-          this.addProperties(item)
-        }
-      }
+					}
+				})
+			},
+			startList(imgList) {
+				if (imgList.length <= 0) {
+					let maxImageNum = this.imageList.length
+					if (maxImageNum > 0) {
+						for (let i = maxImageNum; i > 0; --i) {
+							let keyNum = i - 1;
+							this.delImage(this.imageList[keyNum], keyNum)
+						}
+					}
+				} else {
+					imgList.forEach((item) => {
+						this.addProperties(item)
+					})
+				}
 
-    })
-    query.exec()
-    this.startValue()
-  },
-  methods: {
-    showUploadingImg(showImg) {
-      if (showImg) {
-        if(this.isUploading){
-          return
-        }
-        this.isUploading=true
-        this.$refs.popup.open("bottom");
-      } else {
-        this.$refs.popup.close();
-        this.isUploading=false
-      }
-    },
-    closePopup(e){
-      if(e.show===false){
-        this.isUploading=false
-      }
-    },
-    startValue(){
-      if(!this.isStart){
-        return
-      }
-      if(this.value.length>0){
-        this.isStart=false
-       setTimeout(()=>{
-         this.startList(this.value)
-       },100)
-      }
-    },
-    examineImgOne( index) {
-      // this.$emit('examineImgOne',index)
-      // this.previewList = this.list
-      // this.current = index
-      // this.$refs.previewImage.open(index);
-      let imgList = []
-      this.imageList.forEach((item)=>{
-        console.log(item)
-        imgList.push(item.src)
-      })
-      uni.previewImage({
-        urls: imgList,
-        current: index,
-        success: () => {
+				// this.sortList()
 
-        }
-      })
-    },
-    startList(imgList){
-      if(imgList.length<=0){
-        let maxImageNum=this.imageList.length
-        if(maxImageNum>0){
-          for (let i=maxImageNum;i>0;--i){
-            let keyNum=i-1;
-            this.delImage(this.imageList[keyNum],keyNum)
-          }
-        }
-      }else {
-        imgList.forEach((item)=>{
-          this.addProperties(item)
-        })
-      }
+			},
+			onChange(e, item) {
+				if (!item) return
+				item.oldX = e.detail.x
+				item.oldY = e.detail.y
+				if (e.detail.source === 'touch') {
+					if (item.moveEnd) {
+						item.offset = Math.sqrt(Math.pow(item.oldX - item.absX * this.viewWidth, 2) + Math.pow(item.oldY -
+							item
+							.absY * this.viewWidth, 2))
+					}
+					let x = Math.floor((e.detail.x + this.viewWidth / 2) / this.viewWidth)
+					if (x >= this.colsValue) return
+					let y = Math.floor((e.detail.y + this.viewWidth / 2) / this.viewWidth)
+					let index = this.colsValue * y + x
+					if (item.index != index && index < this.imageList.length) {
+						this.changeStatus = false
+						for (let obj of this.imageList) {
+							if (item.index > index && obj.index >= index && obj.index < item.index) {
+								this.change(obj, 1)
+							} else if (item.index < index && obj.index <= index && obj.index > item.index) {
+								this.change(obj, -1)
+							} else if (obj.id != item.id) {
+								obj.offset = 0
+								obj.x = obj.oldX
+								obj.y = obj.oldY
+								setTimeout(() => {
+									this.$nextTick(() => {
+										obj.x = obj.absX * this.viewWidth
+										obj.y = obj.absY * this.viewWidth
+									})
+								}, 0)
+							}
+						}
+						item.index = index
+						item.absX = x
+						item.absY = y
+						this.sortList()
+					}
+				}
+			},
+			change(obj, i) {
+				obj.index += i
+				obj.offset = 0
+				obj.x = obj.oldX
+				obj.y = obj.oldY
+				obj.absX = obj.index % this.colsValue
+				obj.absY = Math.floor(obj.index / this.colsValue)
+				setTimeout(() => {
+					this.$nextTick(() => {
+						obj.x = obj.absX * this.viewWidth
+						obj.y = obj.absY * this.viewWidth
+					})
+				}, 0)
+			},
+			touchstart(item) {
+				this.imageList.forEach(v => {
+					v.zIndex = v.index + 9
+				})
+				item.zIndex = 99
+				item.moveEnd = true
+				this.tempItem = item
+				this.timer = setTimeout(() => {
+					item.scale = this.scale
+					item.opacity = this.opacity
+					clearTimeout(this.timer)
+					this.timer = null
+				}, 200)
+			},
+			touchend(item) {
+				this.previewImage(item)
+				item.scale = 1
+				item.opacity = 1
+				item.x = item.oldX
+				item.y = item.oldY
+				item.offset = 0
+				item.moveEnd = false
+				setTimeout(() => {
+					this.$nextTick(() => {
+						item.x = item.absX * this.viewWidth
+						item.y = item.absY * this.viewWidth
+						this.tempItem = null
+						this.changeStatus = true
+					})
+				}, 0)
+			},
+			previewImage(item) {
+				console.log(item)
+				if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
+					clearTimeout(this.timer)
+					this.timer = null
+					let src = this.list.findIndex(v => v === item.src)
+					uni.previewImage({
+						urls: this.list,
+						current: src,
+						success: () => {
+							this.preStatus = false
+							setTimeout(() => {
+								this.preStatus = true
+							}, 600)
+						}
+					})
+				} else if (this.timer) {
+					clearTimeout(this.timer)
+					this.timer = null
+				}
+			},
+			mouseenter() {
+				//#ifdef H5
+				this.imageList.forEach(v => {
+					v.disable = false
+				})
+				//#endif
 
-      // this.sortList()
-
-    },
-    onChange(e, item) {
-      if (!item) return
-      item.oldX = e.detail.x
-      item.oldY = e.detail.y
-      if (e.detail.source === 'touch') {
-        if (item.moveEnd) {
-          item.offset = Math.sqrt(Math.pow(item.oldX - item.absX * this.viewWidth, 2) + Math.pow(item.oldY - item
-              .absY * this.viewWidth, 2))
-        }
-        let x = Math.floor((e.detail.x + this.viewWidth / 2) / this.viewWidth)
-        if (x >= this.colsValue) return
-        let y = Math.floor((e.detail.y + this.viewWidth / 2) / this.viewWidth)
-        let index = this.colsValue * y + x
-        if (item.index != index && index < this.imageList.length) {
-          this.changeStatus = false
-          for (let obj of this.imageList) {
-            if (item.index > index && obj.index >= index && obj.index < item.index) {
-              this.change(obj, 1)
-            } else if (item.index < index && obj.index <= index && obj.index > item.index) {
-              this.change(obj, -1)
-            } else if (obj.id != item.id) {
-              obj.offset = 0
-              obj.x = obj.oldX
-              obj.y = obj.oldY
-              setTimeout(() => {
-                this.$nextTick(() => {
-                  obj.x = obj.absX * this.viewWidth
-                  obj.y = obj.absY * this.viewWidth
-                })
-              }, 0)
-            }
-          }
-          item.index = index
-          item.absX = x
-          item.absY = y
-          this.sortList()
-        }
-      }
-    },
-    change(obj, i) {
-      obj.index += i
-      obj.offset = 0
-      obj.x = obj.oldX
-      obj.y = obj.oldY
-      obj.absX = obj.index % this.colsValue
-      obj.absY = Math.floor(obj.index / this.colsValue)
-      setTimeout(() => {
-        this.$nextTick(() => {
-          obj.x = obj.absX * this.viewWidth
-          obj.y = obj.absY * this.viewWidth
-        })
-      }, 0)
-    },
-    touchstart(item) {
-      this.imageList.forEach(v => {
-        v.zIndex = v.index + 9
-      })
-      item.zIndex = 99
-      item.moveEnd = true
-      this.tempItem = item
-      this.timer = setTimeout(() => {
-        item.scale = this.scale
-        item.opacity = this.opacity
-        clearTimeout(this.timer)
-        this.timer = null
-      }, 200)
-    },
-    touchend(item) {
-      this.previewImage(item)
-      item.scale = 1
-      item.opacity = 1
-      item.x = item.oldX
-      item.y = item.oldY
-      item.offset = 0
-      item.moveEnd = false
-      setTimeout(() => {
-        this.$nextTick(() => {
-          item.x = item.absX * this.viewWidth
-          item.y = item.absY * this.viewWidth
-          this.tempItem = null
-          this.changeStatus = true
-        })
-      }, 0)
-    },
-    previewImage(item) {
-      console.log(item)
-      if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
-        clearTimeout(this.timer)
-        this.timer = null
-        let src = this.list.findIndex(v => v === item.src)
-        uni.previewImage({
-          urls: this.list,
-          current: src,
-          success: () => {
-            this.preStatus = false
-            setTimeout(() => {
-              this.preStatus = true
-            }, 600)
-          }
-        })
-      } else if (this.timer) {
-        clearTimeout(this.timer)
-        this.timer = null
-      }
-    },
-    mouseenter() {
-      //#ifdef H5
-      this.imageList.forEach(v => {
-        v.disable = false
-      })
-      //#endif
-
-    },
-    mouseleave() {
-      //#ifdef H5
-      if (this.tempItem) {
-        this.imageList.forEach(v => {
-          v.disable = true
-          v.zIndex = v.index + 1
-          v.offset = 0
-          v.moveEnd = false
-          if (v.id == this.tempItem.id) {
-            if (this.timer) {
-              clearTimeout(this.timer)
-              this.timer = null
-            }
-            v.scale = 1
-            v.opacity = 1
-            v.x = v.oldX
-            v.y = v.oldY
-            this.$nextTick(() => {
-              v.x = v.absX * this.viewWidth
-              v.y = v.absY * this.viewWidth
-              this.tempItem = null
-            })
-          }
-        })
-        this.changeStatus = true
-      }
-      //#endif
-    },
-    selectMultimedia(fileType) {
-      if (this.imgType === 1) {
-        //图片选择
-        this.uploadingImg(fileType);
-      } else {
-        //视频选择
-        this.uploadingVideo(fileType);
-      }
-    },
-    uploadingImg(sourceType) {
-      if (this.list.length > 100) {
-        tools.error('最多上传100张')
-        return;
-      }
-      uni.chooseImage({
-        count: this.fileNum, //默认9
-        sizeType: 'compressed', //可以指定是原图还是压缩图
-        sourceType: [sourceType === 1 ? 'camera' : 'album'],
-        success: (res) => {
-          this.showUploadingImg(false)
-          if (res.tempFiles !== undefined) {
-            res.tempFiles.forEach((file) => {
-              if (file.size > (1048576 * 3)) {
-                tools.error('图片最大3MB')
-              } else {
-                if (this.list.length > 100) {
-                  tools.error('最多上传100张')
-                } else {
-                  if(tools.getPlatform()==='H5'){
-                    this.uploadingFile(file);
-                  }else {
-                    this.uploadingFile(file.path);
-                  }
-                }
-              }
-            })
-          }
-        },
-        fail: (e) => {
-          console.log(e)
-        }
-      });
-    },
-    uploadingVideo(sourceType) {
-      uni.chooseVideo({
-        sourceType: [sourceType === 1 ? 'camera' : 'album'],
-        maxDuration: 60,
-        success: (res) => {
-          this.showUploadingImg(false)
-          console.log(res)
-          this.uploadingFile(res.tempFile);
-        }
-      });
-    },
-    uploadingFile(file) {
-      //图片上传
-      tools.showLoading();
-      this.isStart=false
-      txUploadFile(file).then((res) => {
-        if (res.Location) {
-          this.addProperties(res.Location)
-          tools.hideLoading();
-        }else {
-          tools.hideLoading();
-          tools.error('上传失败')
-        }
-      }).catch((err) => {
-        tools.hideLoading();
-      })
-    },
-    addImages() {
-      if (this.custom) {
-        this.$emit('addImage')
-      } else {
-        let checkNumber = this.number - this.imageList.length
-        uni.chooseImage({
-          count: checkNumber,
-          sourceType: ['album', 'camera'],
-          success: res => {
-            let count = checkNumber <= res.tempFilePaths.length ? checkNumber : res.tempFilePaths.length
-            for (let i = 0; i < count; i++) {
-              this.addProperties(res.tempFilePaths[i])
-            }
-          }
-        })
-      }
-    },
-    addImage(image) {
-      this.addProperties(image)
-    },
-    delImage(item, index) {
-      this.imageList.splice(index, 1)
-      for (let obj of this.imageList) {
-        if (obj.index > item.index) {
-          obj.index -= 1
-          obj.x = obj.oldX
-          obj.y = obj.oldY
-          obj.absX = obj.index % this.colsValue
-          obj.absY = Math.floor(obj.index / this.colsValue)
-          this.$nextTick(() => {
-            obj.x = obj.absX * this.viewWidth
-            obj.y = obj.absY * this.viewWidth
-          })
-        }
-      }
-      this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
-      this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
-      this.sortList()
-    },
-    delImageMp(item, index) {
-      //#ifdef MP
-      this.delImage(item, index)
-      //#endif
-    },
-    sortList() {
-      let list = this.imageList.slice()
-      list.sort((a, b) => {
-        return a.index - b.index
-      })
-      for (let i = 0; i < list.length; i++) {
-        list[i] = list[i].src
-      }
-      // this.$emit('update:list', list)
-      this.$emit('input', list)
-    },
-    addProperties(item) {
-      console.log('------------------addProperties')
-      console.log(item)
-      let absX = this.imageList.length % this.colsValue
-      let absY = Math.floor(this.imageList.length / this.colsValue)
-      let x = absX * this.viewWidth
-      let y = absY * this.viewWidth
-      this.imageList.push({
-        src: item,
-        x,
-        y,
-        oldX: x,
-        oldY: y,
-        absX,
-        absY,
-        scale: 1,
-        zIndex: 9,
-        opacity: 1,
-        index: this.imageList.length,
-        id: this.guid(),
-        disable: false,
-        offset: 0,
-        moveEnd: false
-      })
-      this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
-      this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
-      this.sortList()
-    },
-    nothing() {},
-    rpx2px(v) {
-      return this.width * v / 750
-    },
-    guid() {
-      function S4() {
-        return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
-      }
-      return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
-    }
-  }
-}
+			},
+			mouseleave() {
+				//#ifdef H5
+				if (this.tempItem) {
+					this.imageList.forEach(v => {
+						v.disable = true
+						v.zIndex = v.index + 1
+						v.offset = 0
+						v.moveEnd = false
+						if (v.id == this.tempItem.id) {
+							if (this.timer) {
+								clearTimeout(this.timer)
+								this.timer = null
+							}
+							v.scale = 1
+							v.opacity = 1
+							v.x = v.oldX
+							v.y = v.oldY
+							this.$nextTick(() => {
+								v.x = v.absX * this.viewWidth
+								v.y = v.absY * this.viewWidth
+								this.tempItem = null
+							})
+						}
+					})
+					this.changeStatus = true
+				}
+				//#endif
+			},
+			selectMultimedia(fileType) {
+				if (this.imgType === 1) {
+					//图片选择
+					this.uploadingImg(fileType);
+				} else {
+					//视频选择
+					this.uploadingVideo(fileType);
+				}
+			},
+			uploadingImg(sourceType) {
+				if (this.list.length > 100) {
+					tools.error('最多上传100张')
+					return;
+				}
+				uni.chooseImage({
+					count: this.fileNum, //默认9
+					sizeType: 'compressed', //可以指定是原图还是压缩图
+					sourceType: [sourceType === 1 ? 'camera' : 'album'],
+					success: (res) => {
+						this.showUploadingImg(false)
+						if (res.tempFiles !== undefined) {
+							res.tempFiles.forEach((file) => {
+								if (file.size > (1048576 * 3)) {
+									tools.error('图片最大3MB')
+								} else {
+									if (this.list.length > 100) {
+										tools.error('最多上传100张')
+									} else {
+										if (tools.getPlatform() === 'H5') {
+											this.uploadingFile(file);
+										} else {
+											this.uploadingFile(file.path);
+										}
+									}
+								}
+							})
+						}
+					},
+					fail: (e) => {
+						console.log(e)
+					}
+				});
+			},
+			uploadingVideo(sourceType) {
+				uni.chooseVideo({
+					sourceType: [sourceType === 1 ? 'camera' : 'album'],
+					maxDuration: 60,
+					success: (res) => {
+						this.showUploadingImg(false)
+						console.log(res)
+						this.uploadingFile(res.tempFile);
+					}
+				});
+			},
+			uploadingFile(file) {
+				//图片上传
+				tools.showLoading();
+				this.isStart = false
+				txUploadFile(file).then((res) => {
+					if (res.Location) {
+						this.addProperties(res.Location)
+						tools.hideLoading();
+					} else {
+						tools.hideLoading();
+						tools.error('上传失败')
+					}
+				}).catch((err) => {
+					tools.hideLoading();
+				})
+			},
+			addImages() {
+				if (this.custom) {
+					this.$emit('addImage')
+				} else {
+					let checkNumber = this.number - this.imageList.length
+					uni.chooseImage({
+						count: checkNumber,
+						sourceType: ['album', 'camera'],
+						success: res => {
+							let count = checkNumber <= res.tempFilePaths.length ? checkNumber : res
+								.tempFilePaths.length
+							for (let i = 0; i < count; i++) {
+								this.addProperties(res.tempFilePaths[i])
+							}
+						}
+					})
+				}
+			},
+			addImage(image) {
+				this.addProperties(image)
+			},
+			delImage(item, index) {
+				this.imageList.splice(index, 1)
+				for (let obj of this.imageList) {
+					if (obj.index > item.index) {
+						obj.index -= 1
+						obj.x = obj.oldX
+						obj.y = obj.oldY
+						obj.absX = obj.index % this.colsValue
+						obj.absY = Math.floor(obj.index / this.colsValue)
+						this.$nextTick(() => {
+							obj.x = obj.absX * this.viewWidth
+							obj.y = obj.absY * this.viewWidth
+						})
+					}
+				}
+				this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+				this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+				this.sortList()
+			},
+			delImageMp(item, index) {
+				//#ifdef MP
+				this.delImage(item, index)
+				//#endif
+			},
+			sortList() {
+				let list = this.imageList.slice()
+				list.sort((a, b) => {
+					return a.index - b.index
+				})
+				for (let i = 0; i < list.length; i++) {
+					list[i] = list[i].src
+				}
+				// this.$emit('update:list', list)
+				this.$emit('input', list)
+			},
+			addProperties(item) {
+				console.log('------------------addProperties')
+				console.log(item)
+				let absX = this.imageList.length % this.colsValue
+				let absY = Math.floor(this.imageList.length / this.colsValue)
+				let x = absX * this.viewWidth
+				let y = absY * this.viewWidth
+				this.imageList.push({
+					src: item,
+					x,
+					y,
+					oldX: x,
+					oldY: y,
+					absX,
+					absY,
+					scale: 1,
+					zIndex: 9,
+					opacity: 1,
+					index: this.imageList.length,
+					id: this.guid(),
+					disable: false,
+					offset: 0,
+					moveEnd: false
+				})
+				this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+				this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+				this.sortList()
+			},
+			nothing() {},
+			rpx2px(v) {
+				return this.width * v / 750
+			},
+			guid() {
+				function S4() {
+					return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+				}
+				return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-@import url("../../static/css/en-common.css");
-@import "@/static/css/wh-common";
-.con {
-  padding: 30rpx 0;
-  border-bottom: 2rpx solid #F0F0F0;
-  .con-title{
-    font-size: 32rpx;
-    color: #333333;
-    padding-bottom: 10rpx;
-  }
+	@import url("../../static/css/en-common.css");
+	@import "@/static/css/wh-common";
+
+	.con {
+		padding: 30rpx 0;
+		border-bottom: 2rpx solid #F0F0F0;
+
+		.con-title {
+			font-size: 28rpx;
+			color: #333333;
+			padding-bottom: 10rpx;
+		}
+
+		.area {
+			width: 100%;
+
+			.view {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.area-con {
+					position: relative;
 
-  .area {
-    width: 100%;
+					.pre-image {
+						width: 100%;
+						height: 100%;
+						border-radius: 10rpx;
+					}
 
-    .view {
-      display: flex;
-      justify-content: center;
-      align-items: center;
+					.bf-img {
+						width: 40rpx;
+						height: 40rpx;
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						//margin: -20rpx 0 0 -20rpx;
+						z-index: 2;
+					}
 
-      .area-con {
-        position: relative;
+					.del-con {
+						position: absolute;
+						top: 5rpx;
+						right: 5rpx;
+						//padding: 0 0 20rpx 20rpx;
 
-        .pre-image {
-          width: 100%;
-          height: 100%;
-          border-radius: 10rpx;
-        }
+						.del-wrap {
+							width: 36rpx;
+							height: 36rpx;
+							//background-color: rgba(0, 0, 0, 0.4);
+							border-radius: 0 0 0 10rpx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
 
-        .bf-img {
-          width: 40rpx;
-          height: 40rpx;
-          position: absolute;
-          left: 50%;
-          top: 50%;
-          //margin: -20rpx 0 0 -20rpx;
-          z-index: 2;
-        }
+							.del-image {
+								//width: 20rpx;
+								//height: 20rpx;
+							}
+						}
+					}
+				}
+			}
 
-        .del-con {
-          position: absolute;
-          top: 5rpx;
-          right: 5rpx;
-          //padding: 0 0 20rpx 20rpx;
+			.add {
+				position: absolute;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
-          .del-wrap {
-            width: 36rpx;
-            height: 36rpx;
-            //background-color: rgba(0, 0, 0, 0.4);
-            border-radius: 0 0 0 10rpx;
-            display: flex;
-            justify-content: center;
-            align-items: center;
+				.add-wrap {
+					// display: flex;
+					// justify-content: center;
+					// align-items: center;
+					background: #F7F7F7;
+					border-radius: 10rpx;
 
-            .del-image {
-              //width: 20rpx;
-              //height: 20rpx;
-            }
-          }
-        }
-      }
-    }
+					.add-img {
+						width: 80rpx;
+						height: 80rpx;
+						margin: 0 auto;
+						padding-top: 44rpx;
+					}
 
-    .add {
-      position: absolute;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+					.names {
+						color: #6F6F6F;
+						font-size: 28rpx;
+						text-align: center;
+					}
 
-      .add-wrap {
-        // display: flex;
-        // justify-content: center;
-        // align-items: center;
-        background: #F7F7F7;
-        border-radius: 10rpx;
+					.video-data {
+						width: 160rpx;
+						height: 160rpx;
+						//background-color: #fff;
+						text-align: center;
+						line-height: 160rpx;
 
-        .add-img {
-          width: 80rpx;
-          height: 80rpx;
-          margin: 0 auto;
-          padding-top: 44rpx;
-        }
+						.video-img {
+							font-size: 80rpx;
+							color: #999;
+						}
+					}
 
-        .names {
-          color: #6F6F6F;
-          font-size: 28rpx;
-          text-align: center;
-        }
-        .video-data{
-          width: 160rpx;
-          height: 160rpx;
-          //background-color: #fff;
-          text-align: center;
-          line-height: 160rpx;
-          .video-img {
-            font-size: 80rpx;
-            color: #999;
-          }
-        }
+				}
+			}
+		}
+	}
 
-      }
-    }
-  }
-}
-.no-con{
-  padding: 0;
-  border: none;
-}
-</style>
+	.no-con {
+		padding: 0;
+		border: none;
+	}
+</style>

components/en-utils/en-button/en-button.vue

@@ -11,16 +11,16 @@
 			<button class="en-button button-background sys-weight-500" type="default" hover-class="is-hover"
 				:style="[{width:bothWidth},{borderRadius},{fontSize},{color}]" @click="onSubmit">{{rightText}}</button>
 		</view>
-    <view class="row-justify-sb center p-lr30 p-t20" :class="is_fixed?'fixed-button':''" v-else-if="is_both===2">
-      <button class="en-button-left button-background button-color sys-weight-500 m-r30" type="default"
-              hover-class="is-hover" :style="[{width:'33%'},{borderRadius},{fontSize}]"
-              @click="onLeftSubmit">{{leftText}}</button>
-      <button class="en-button-left button-background button-color sys-weight-500 m-r30" type="default"
-              hover-class="is-hover" :style="[{width:'33%'},{borderRadius},{fontSize}]"
-              @click="onCentreSubmit">{{centreText}}</button>
-      <button class="en-button button-background sys-weight-500" type="default" hover-class="is-hover"
-              :style="[{width:'33%'},{borderRadius},{fontSize},{color}]" @click="onSubmit">{{rightText}}</button>
-    </view>
+		<view class="row-justify-sb center p-lr30 p-t20" :class="is_fixed?'fixed-button':''" v-else-if="is_both===2">
+			<button class="en-button-left button-background button-color sys-weight-500 m-r30" type="default"
+				hover-class="is-hover" :style="[{width:'33%'},{borderRadius},{fontSize}]"
+				@click="onLeftSubmit">{{leftText}}</button>
+			<button class="en-button-left button-background button-color sys-weight-500 m-r30" type="default"
+				hover-class="is-hover" :style="[{width:'33%'},{borderRadius},{fontSize}]"
+				@click="onCentreSubmit">{{centreText}}</button>
+			<button class="en-button button-background sys-weight-500" type="default" hover-class="is-hover"
+				:style="[{width:'33%'},{borderRadius},{fontSize},{color}]" @click="onSubmit">{{rightText}}</button>
+		</view>
 	</view>
 </template>
 
@@ -113,7 +113,7 @@
 	.fixed-button {
 		position: fixed;
 		bottom: 0;
-		z-index: 4;
+		z-index: 10;
 		background: #fff;
 		width: calc(100% - 60rpx);
 		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));

components/en-utils/en-image-video/en-image-video.vue

@@ -0,0 +1,82 @@
+<template>
+	<view>
+		<view class="row image-box">
+			<view class="image-item m-r20 m-t20" mode="aspectFill" v-for="(item,index) in imgList">
+				<image class="image r-10 " :src="item.url" :style="[{width},{height}]" @click="onPreviewImage(item)">
+				</image>
+				<image class="wh-45 video-icon" src="/static/img/task/play.png" mode="aspectFill" v-if="item.type == 2">
+				</image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			is_both: {
+				type: Boolean,
+				default: false
+			},
+			width: {
+				type: String,
+				default: '130rpx'
+			},
+			height: {
+				type: String,
+				default: '130rpx'
+			},
+			img: {
+				default: []
+			},
+			previewImage: {
+				default: []
+			}
+		},
+		data() {
+			return {
+				imgList: [{
+					url: '/static/img/index/top-nav.png',
+					type: 1
+				}, {
+					url: '/static/img/index/top-nav.png',
+					type: 2
+				}, {
+					url: '/static/img/index/top-nav.png',
+					type: 1
+				}, {
+					url: '/static/img/index/top-nav.png',
+					type: 2
+				}, {
+					url: '/static/img/index/top-nav.png',
+					type: 2
+				}, ]
+			}
+		},
+		mounted() {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.image-box {
+		flex-wrap: wrap;
+	}
+
+	.image-item {
+		position: relative;
+
+		.image {
+			display: block;
+		}
+
+		.video-icon {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+		}
+	}
+</style>

components/en-utils/en-image/en-image.vue

@@ -3,6 +3,7 @@
 		<view class="row image-box">
 			<image class="image-item r-10 m-r20 m-b20" :style="[{width},{height}]" :src="item" mode="aspectFill"
 				v-for="(item,index) in imgList" @click="onPreviewImage(item)"></image>
+			<image class="wh-45" src="/static/img/task/play.png" mode="aspectFill"></image>
 		</view>
 	</view>
 </template>

page_task/credit_upload/credit_upload.vue

@@ -0,0 +1,65 @@
+<template>
+	<view class="total-page page-box task-bg page-env-20">
+		<Nav title="上传征信" :genre="1" is_fixed></Nav>
+		<view class="p-lr30 p-t10 container">
+			<text>已上传（0页）</text>
+			<view class=" container">
+				<view class="column-c justify-center item-box" @click="onUpload">
+					<image class="wh-45 m-b10" src="/static/img/information/credit.png" mode="aspectFill"></image>
+					<text class="text-color-666 size-26">上传征信</text>
+				</view>
+				<view class="item-box" v-for="(item,index) in 10">
+					<!-- 	<image style="width: 100%;height: 240rpx;" src="/static/img/index/top-nav.png"
+						mode="aspectFill">
+					</image> -->
+					1ddadsad
+					<image class="wh-30 delete_iocn" src="/static/img/information/blank_delete.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			// onUpload() {
+			// 	this.$refs.popup.open('bottom')
+			// },
+			// onClose() {
+			// 	this.$refs.popup.close('bottom')
+			// },
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		gap: 10px;
+
+		.item-box {
+			flex: 0 0 calc(50% - 5px);
+			box-sizing: border-box;
+			border: 1rpx dashed #999999;
+			height: 240rpx;
+			border-radius: 10rpx;
+			text-align: center;
+			background: #F7F9FE;
+			position: relative;
+
+			.delete_iocn {
+				position: absolute;
+				right: -12rpx;
+				top: -12rpx;
+			}
+		}
+	}
+</style>

page_task/information/information.vue

@@ -14,8 +14,10 @@
 						</view>
 					</view>
 					<view class="">
-						<button class="button-background info_button sys-weight-500 text-color-fff size-26 r-100" v-if="item.is_finish">已完成</button>
-						<button class="sys-bg-CBCBCB info_button sys-weight-500 text-color-fff size-26 r-100" v-else>待上传</button>
+						<button class="button-background info_button sys-weight-500 text-color-fff size-26 r-100"
+							v-if="item.is_finish">已完成</button>
+						<button class="sys-bg-CBCBCB info_button sys-weight-500 text-color-fff size-26 r-100"
+							v-else>待上传</button>
 					</view>
 				</view>
 			</view>
@@ -75,7 +77,7 @@
 					is_finish: false,
 					is_show: false,
 					type_keys: []
-				},  {
+				}, {
 					name: '第三方信息',
 					explain: '第三方企业/人员相关信息',
 					icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-three.png',
@@ -85,18 +87,19 @@
 					is_show: false,
 					type_keys: []
 				}, {
-          name: '联系人信息',
-          explain: '其他联系人',
-          icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-contacts.png',
-          type: 5,
-          path: '/page_task/linkman/linkman',
-          is_finish: false,
-          is_show: false,
-          type_keys: []
-        },{
+					name: '联系人信息',
+					explain: '其他联系人',
+					icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-contacts.png',
+					type: 5,
+					path: '/page_task/linkman/linkman',
+					is_finish: false,
+					is_show: false,
+					type_keys: []
+				}, {
 					name: '征信信息',
 					explain: '银行征信信息',
 					icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-credit.png',
+					path: '/page_task/credit_upload/credit_upload',
 					type: 6,
 					is_finish: false,
 					is_show: false,
@@ -158,7 +161,9 @@
 					"tripartite": [],
 					"linkman": [],
 					"credit": {
-						'credit_img': ['https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-credit.png'],
+						'credit_img': [
+							'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-credit.png'
+						],
 						'deal_data': [],
 						'overdue_data': [],
 						'query_data': [],
@@ -178,12 +183,12 @@
 			}
 		},
 		watch: {
-      'taskData': {
-        handler() {
-          this.setBusinessCache()
-        },
-        deep: true
-      },
+			'taskData': {
+				handler() {
+					this.setBusinessCache()
+				},
+				deep: true
+			},
 			'productInfo.product_types': function() {
 				let productTypes = this.productInfo.product_types
 				if (typeof productTypes === 'string') {
@@ -214,39 +219,39 @@
 					this.getTaskTypeInfo(data.productId)
 				}
 			}
-      setTimeout(() => {
-        //5秒后开启缓记录
-        this.isCache = false;
-      }, 8000)
-      uni.$on('putClientInfo',clientInfo=>{
-        if(this.taskData.clientInfo.id_number!==clientInfo.id_number){
-          this.taskData.clientInfo=clientInfo
-          this.getClientInfo()
-        }else {
-          this.taskData.clientInfo=clientInfo
-          this.verifyBusinessModuleKey(1)
-        }
-      })
-      //更新资产信息
-      uni.$on('putPropertyInfo',propertyInfo=>{
-        this.taskData.property=propertyInfo
-        this.verifyBusinessModuleKey(2)
-      })
-      //更新申请信息
-      uni.$on('putAppliesInfo',appliesInfo=>{
-        this.taskData.applies=appliesInfo
-        this.verifyBusinessModuleKey(3)
-      })
-      //更新第三方信息
-      uni.$on('putTripartiteInfo',tripartiteInfo=>{
-        this.taskData.tripartite=tripartiteInfo
-        this.verifyBusinessModuleKey(4)
-      })
-      //更新联系人信息
-      uni.$on('putLinkmenInfo',linkmenInfo=>{
-        this.taskData.linkman=linkmenInfo
-        this.verifyBusinessModuleKey(5)
-      })
+			setTimeout(() => {
+				//5秒后开启缓记录
+				this.isCache = false;
+			}, 8000)
+			uni.$on('putClientInfo', clientInfo => {
+				if (this.taskData.clientInfo.id_number !== clientInfo.id_number) {
+					this.taskData.clientInfo = clientInfo
+					this.getClientInfo()
+				} else {
+					this.taskData.clientInfo = clientInfo
+					this.verifyBusinessModuleKey(1)
+				}
+			})
+			//更新资产信息
+			uni.$on('putPropertyInfo', propertyInfo => {
+				this.taskData.property = propertyInfo
+				this.verifyBusinessModuleKey(2)
+			})
+			//更新申请信息
+			uni.$on('putAppliesInfo', appliesInfo => {
+				this.taskData.applies = appliesInfo
+				this.verifyBusinessModuleKey(3)
+			})
+			//更新第三方信息
+			uni.$on('putTripartiteInfo', tripartiteInfo => {
+				this.taskData.tripartite = tripartiteInfo
+				this.verifyBusinessModuleKey(4)
+			})
+			//更新联系人信息
+			uni.$on('putLinkmenInfo', linkmenInfo => {
+				this.taskData.linkman = linkmenInfo
+				this.verifyBusinessModuleKey(5)
+			})
 		},
 		methods: {
 			addTask() {
@@ -315,17 +320,17 @@
 				} else if (verifyKey === 7) {
 					data = this.taskData.post_loan
 				}
-        this.setBusinessCache()
+				this.setBusinessCache()
 				verifyBusinessModuleKey({
 					'productId': this.productInfo.id,
 					'data': data,
 					'type': verifyKey
 				}).then((res) => {
-          this.informationList.forEach(item=>{
-            if(item.type===verifyKey){
-              item.is_finish= res.code === 1;
-            }
-          })
+					this.informationList.forEach(item => {
+						if (item.type === verifyKey) {
+							item.is_finish = res.code === 1;
+						}
+					})
 				})
 			},
 			getClientInfo() {
@@ -342,7 +347,7 @@
 						if (res.data.business) {
 							res.data.business.id = ''
 							this.taskData.clientInfo = res.data.business
-              uni.$emit('setClientData',this.taskData.clientInfo)
+							uni.$emit('setClientData', this.taskData.clientInfo)
 						}
 						if (res.data.propertyList) {
 							this.taskData.property = res.data.propertyList
@@ -509,7 +514,7 @@
 					uni.setStorageSync('propertyKey', item.type_keys)
 					uni.setStorageSync('propertyData', this.taskData.property)
 				} else if (item.type === 3) {
-          uni.setStorageSync('propertyData', this.taskData.property)
+					uni.setStorageSync('propertyData', this.taskData.property)
 					uni.setStorageSync('appliesKey', item.type_keys)
 					uni.setStorageSync('appliesData', this.taskData.applies)
 				} else if (item.type === 4) {
@@ -548,4 +553,4 @@
 	button::after {
 		border: none;
 	}
-</style>
+</style>

page_task/linkman/linkman.vue

@@ -1,211 +1,219 @@
 <template>
-  <view class="total-page page-env-160 page-box task-bg">
-    <Nav :title="title" is_fixed :genre="4" :opacity="scrollTop"></Nav>
-    <view id="apply-info" class="m-t20 m-lr30 text-color-12">
-      <view class="sys-background-fff r-20 p-20 m-b20" v-for="(linkmen,index) in linkmenList" :key="index">
-        <!-- 个人担保start -->
-        <view class="" v-if="editIndex!==index">
-          <!-- 个人担保信息start -->
-          <view class="sys-from-background-color p-20 r-20 size-26" >
-            <view class="">
-              <view class="row-justify-sb center">
-                <text class="size-28 sys-weight-600">联系人信息({{index+1}})</text>
-                <view class="row-c sys-background-fff r-100 p-lr30 p-tb10">
-                  <image class="wh-30" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/information/edit.png" mode="aspectFill"
-                         @click="onEditInfo(index)"></image>
-                  <view class="title-line m-lr20"></view>
-                  <image class="wh-30" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/information/delete.png" mode="aspectFill"
-                         @click="delTripartite(index)">
-                  </image>
-                </view>
-              </view>
-              <view class="row-c p-tb30" v-if="verifyKey('name')" >
-                <view class="text-color-666"><text></text>姓名：</view>
-                <text>{{linkmen.name}}</text>
-              </view>
-              <view class="row-c" v-if="verifyKey('relation')">
-                <view class="text-color-666"><text></text>关系：</view>
-                <text>{{getRelationText(linkmen.relation)}}</text>
-              </view>
-              <view class="row-c" v-if="verifyKey('phone')">
-                <view class="text-color-666"><text></text>手机号：</view>
-                <text>{{linkmen.phone}}</text>
-              </view>
-              <view class="row-c" v-if="verifyKey('special_plane')">
-                <view class="text-color-666"><text></text>联系电话：</view>
-                <text>{{linkmen.special_plane}}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view  v-else>
-          <en-input label="姓名"  v-if="verifyKey('name')"  v-model="linkmen.name" type="text" placeholder="输入联系人姓名"></en-input>
-          <en-select label="关系"  v-if="verifyKey('relation')"  v-model="linkmen.relation" placeholder="请选择与贷款人的关系" :local-data="relationList"></en-select>
-          <en-input label="手机号"  v-if="verifyKey('phone')"  v-model="linkmen.phone" type="number" placeholder="请输入联系人的手机号"></en-input>
-          <en-input label="联系电话"  v-if="verifyKey('special_plane')"  v-model="linkmen.special_plane" type="text" placeholder="请输入联系人电话"></en-input>
-        </view>
-      </view>
-      <en-blank message="暂无联系人信息~~" v-if="linkmenList.length<=0"></en-blank>
+	<view class="total-page page-env-160 page-box task-bg">
+		<Nav :title="title" is_fixed :genre="4" :opacity="scrollTop"></Nav>
+		<view id="apply-info" class="m-t20 m-lr30 text-color-12">
+			<view class="sys-background-fff r-20 p-20 m-b20" v-for="(linkmen,index) in linkmenList" :key="index">
+				<!-- 个人担保start -->
+				<view class="" v-if="editIndex!==index">
+					<!-- 个人担保信息start -->
+					<view class="sys-from-background-color p-20 r-20 size-26">
+						<view class="">
+							<view class="row-justify-sb center">
+								<text class="size-28 sys-weight-600">联系人信息({{index+1}})</text>
+								<view class="row-c sys-background-fff r-100 p-lr30 p-tb10">
+									<image class="wh-30"
+										src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/information/edit.png"
+										mode="aspectFill" @click="onEditInfo(index)"></image>
+									<view class="title-line m-lr20"></view>
+									<image class="wh-30"
+										src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/information/delete.png"
+										mode="aspectFill" @click="delTripartite(index)">
+									</image>
+								</view>
+							</view>
+							<view class="row-c p-t30" v-if="verifyKey('name')">
+								<view class="text-color-666"><text></text>姓名：</view>
+								<text>{{linkmen.name}}</text>
+							</view>
+							<view class="row-c p-t30" v-if="verifyKey('relation')">
+								<view class="text-color-666"><text></text>关系：</view>
+								<text>{{getRelationText(linkmen.relation)}}</text>
+							</view>
+							<view class="row-c p-t30" v-if="verifyKey('phone')">
+								<view class="text-color-666"><text></text>手机号：</view>
+								<text>{{linkmen.phone}}</text>
+							</view>
+							<view class="row-c p-t30" v-if="verifyKey('special_plane')">
+								<view class="text-color-666"><text></text>联系电话：</view>
+								<text>{{linkmen.special_plane}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-else>
+					<en-input label="姓名" v-if="verifyKey('name')" v-model="linkmen.name" type="text"
+						placeholder="输入联系人姓名"></en-input>
+					<en-select label="关系" v-if="verifyKey('relation')" v-model="linkmen.relation"
+						placeholder="请选择与贷款人的关系" :local-data="relationList"></en-select>
+					<en-input label="手机号" v-if="verifyKey('phone')" v-model="linkmen.phone" type="number"
+						placeholder="请输入联系人的手机号"></en-input>
+					<en-input label="联系电话" v-if="verifyKey('special_plane')" v-model="linkmen.special_plane" type="text"
+						placeholder="请输入联系人电话"></en-input>
+				</view>
+			</view>
+			<en-blank message="暂无联系人信息~~" v-if="linkmenList.length<=0"></en-blank>
 
-      <button class="size-26 r-10 button-color apply-button m-t30" hover-class="is-hover"
-              @click="addItem">+添加联系方式信息</button>
-    </view>
-    <EnButton  leftText="保存"  @onSubmit="onSubmit">
-    </EnButton>
-  </view>
+			<button class="size-26 r-10 button-color apply-button m-t30" hover-class="is-hover"
+				@click="addItem">+添加联系方式信息</button>
+		</view>
+		<EnButton leftText="保存" @onSubmit="onSubmit">
+		</EnButton>
+	</view>
 </template>
 
 <script>
-import WhInput from "@/components/en-from/en-input/en-input.vue"
-import EnUpload from "@/components/en-from/en-upload/en-upload.vue"
-import EnImage from "@/components/en-utils/en-image/en-image.vue"
-import AddIdentity from "@/page_task/identity_upload/add-identity.vue";
-import EnInput from "@/components/en-from/en-input/en-input.vue";
-import AddLicense from "@/page_task/apply/components/add-license.vue";
-import EnBlank from "@/components/en-utils/en-blank/en-blank.vue";
-import AddBank from "@/page_task/apply/components/add-bank.vue";
-import tools from "@/service/tools";
-import EnSelect from "@/components/en-from/en-select/en-select.vue";
-import {getTaskRelations} from "@/api/task";
+	import WhInput from "@/components/en-from/en-input/en-input.vue"
+	import EnUpload from "@/components/en-from/en-upload/en-upload.vue"
+	import EnImage from "@/components/en-utils/en-image/en-image.vue"
+	import AddIdentity from "@/page_task/identity_upload/add-identity.vue";
+	import EnInput from "@/components/en-from/en-input/en-input.vue";
+	import AddLicense from "@/page_task/apply/components/add-license.vue";
+	import EnBlank from "@/components/en-utils/en-blank/en-blank.vue";
+	import AddBank from "@/page_task/apply/components/add-bank.vue";
+	import tools from "@/service/tools";
+	import EnSelect from "@/components/en-from/en-select/en-select.vue";
+	import {
+		getTaskRelations
+	} from "@/api/task";
 
-export default {
-  components: {
-    EnSelect,
-    AddBank,
-    EnBlank,
-    AddLicense,
-    EnInput,
-    AddIdentity,
-    WhInput,
-    EnUpload,
-    EnImage
-  },
-  data() {
-    return {
-      title: '',
-      scrollTop: 0,
-      editIndex:0,
-      showKeys:[],
-      relationList:[],
-      linkmenList:[],
-      linkmenItem:{
-        "name": "",
-        "relation": "",
-        "phone": "",
-        "special_plane": ""
-      }
-    }
-  },
-  onPageScroll(res) {
-    this.scrollTop = res.scrollTop / 120
-  },
-  onLoad(options) {
-    this.title = options.title
-    let linkmenList = uni.getStorageSync('linkmanData')
-    let linkmanKey = uni.getStorageSync('linkmanKey')
-    this.linkmenList=linkmenList
-    this.showKeys=linkmanKey
-    if(this.linkmenList.length<=0){
-      this.addItem()
-    }
-    this.getTaskRelations()
-  },
-  methods: {
-    getRelationText(type){
-      let item=this.relationList.filter(val=>val.value===type*1)
-      if(item.length>0){
-        return item[0].text
-      }else {
-        return '';
-      }
-    },
-    async getTaskRelations() {
-      const res = await getTaskRelations()
-      if (res.code === 1) {
-        this.relationList = res.data
-        this.relationList.map((val) => {
-          val.text = val.name;
-        });
-      }
-    },
-    addItem(){
-      console.log(this.linkmenList)
-      this.linkmenList.push(JSON.parse(JSON.stringify(this.linkmenItem)))
-      this.editIndex=this.linkmenList.length-1
-    },
-    verifyKey(field) {
-      return this.showKeys.indexOf(field) >= 0
-    },
-    delTripartite(itemKey){
-      uni.showModal({
-        title: '是否删除当前还款信息',
-        content: '确定删除?',
-        success: (res) => {
-          if (res.confirm) {
-            this.linkmenList.splice(itemKey,1)
-          }
-        }
-      })
+	export default {
+		components: {
+			EnSelect,
+			AddBank,
+			EnBlank,
+			AddLicense,
+			EnInput,
+			AddIdentity,
+			WhInput,
+			EnUpload,
+			EnImage
+		},
+		data() {
+			return {
+				title: '',
+				scrollTop: 0,
+				editIndex: 0,
+				showKeys: [],
+				relationList: [],
+				linkmenList: [],
+				linkmenItem: {
+					"name": "",
+					"relation": "",
+					"phone": "",
+					"special_plane": ""
+				}
+			}
+		},
+		onPageScroll(res) {
+			this.scrollTop = res.scrollTop / 120
+		},
+		onLoad(options) {
+			this.title = options.title
+			let linkmenList = uni.getStorageSync('linkmanData')
+			let linkmanKey = uni.getStorageSync('linkmanKey')
+			this.linkmenList = linkmenList
+			this.showKeys = linkmanKey
+			if (this.linkmenList.length <= 0) {
+				this.addItem()
+			}
+			this.getTaskRelations()
+		},
+		methods: {
+			getRelationText(type) {
+				let item = this.relationList.filter(val => val.value === type * 1)
+				if (item.length > 0) {
+					return item[0].text
+				} else {
+					return '';
+				}
+			},
+			async getTaskRelations() {
+				const res = await getTaskRelations()
+				if (res.code === 1) {
+					this.relationList = res.data
+					this.relationList.map((val) => {
+						val.text = val.name;
+					});
+				}
+			},
+			addItem() {
+				console.log(this.linkmenList)
+				this.linkmenList.push(JSON.parse(JSON.stringify(this.linkmenItem)))
+				this.editIndex = this.linkmenList.length - 1
+			},
+			verifyKey(field) {
+				return this.showKeys.indexOf(field) >= 0
+			},
+			delTripartite(itemKey) {
+				uni.showModal({
+					title: '是否删除当前还款信息',
+					content: '确定删除?',
+					success: (res) => {
+						if (res.confirm) {
+							this.linkmenList.splice(itemKey, 1)
+						}
+					}
+				})
 
-    },
-    setValue(){
-      console.log(this.value)
-      if (this.value ) {
-        this.linkmenList = this.value
-      }
-      if(this.linkmenList.length<=0){
-        this.addItem()
-      }
-    },
-    // 提交
-    onSubmit() {
-      uni.$emit('putLinkmenInfo',this.linkmenList)
-      setTimeout(()=>{
-        tools.leftClick()
-      },50)
-    },
-    // 编辑单个信息
-    onEditInfo(index) {
-      this.editIndex=index
-    },
-  }
-}
+			},
+			setValue() {
+				console.log(this.value)
+				if (this.value) {
+					this.linkmenList = this.value
+				}
+				if (this.linkmenList.length <= 0) {
+					this.addItem()
+				}
+			},
+			// 提交
+			onSubmit() {
+				uni.$emit('putLinkmenInfo', this.linkmenList)
+				setTimeout(() => {
+					tools.leftClick()
+				}, 50)
+			},
+			// 编辑单个信息
+			onEditInfo(index) {
+				this.editIndex = index
+			},
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.attestation-button {
-  width: 156rpx;
-  height: 54rpx;
-  line-height: 54rpx;
-  background: #FFFFFF;
-  border: 1rpx solid #0FB160;
-}
+	.attestation-button {
+		width: 156rpx;
+		height: 54rpx;
+		line-height: 54rpx;
+		background: #FFFFFF;
+		border: 1rpx solid #0FB160;
+	}
 
-.still-button {
-  width: 260rpx;
-  background: #FFFFFF;
-  border-radius: 10rpx;
-  border: 1rpx solid #0FB160;
-}
+	.still-button {
+		width: 260rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		border: 1rpx solid #0FB160;
+	}
 
-.apply-button {
-  height: 80rpx;
-  line-height: 80rpx;
-  background: #FFFFFF;
-  border: 2rpx solid #0FB160;
-  margin-bottom: 100rpx;
-}
+	.apply-button {
+		height: 80rpx;
+		line-height: 80rpx;
+		background: #FFFFFF;
+		border: 2rpx solid #0FB160;
+		margin-bottom: 100rpx;
+	}
 
-.apply-button-save {
-  width: 140rpx;
-  background: #FFFFFF;
-  border: 2rpx solid #0FB160;
-}
+	.apply-button-save {
+		width: 140rpx;
+		background: #FFFFFF;
+		border: 2rpx solid #0FB160;
+	}
 
-.apply-button-delete {
-  color: #E83F37;
-  width: 140rpx;
-  background: #FFFFFF;
-  border: 2rpx solid #E83F37;
-}
-</style>
+	.apply-button-delete {
+		color: #E83F37;
+		width: 140rpx;
+		background: #FFFFFF;
+		border: 2rpx solid #E83F37;
+	}
+</style>

page_task/property/components/house.vue

@@ -1,6 +1,9 @@
 <template>
 	<view class="">
-		<view class="data-from" v-for="item in houseList">
+		<view class="data-from" v-for="(item,index) in houseList">
+			<view class="size-28 sys-weight-600 p-t30">
+				房产信息({{index+1}})
+			</view>
 			<en-input label="产权人" type="text" placeholder="请输入产权人" v-model="item.data.property_owner"
 				v-if="verifyKey('property_owner')"></en-input>
 			<en-input label="房产证号" v-model="item.data.deed_num" v-if="verifyKey('deed_num')" type="text"

page_task/property/property.vue

@@ -16,8 +16,8 @@
 						<House></House>
 					</view>
 				</view> -->
-				<uni-collapse ref="collapse" accordion class="sys-from-background-color" >
-					<uni-collapse-item titleBorder="none" :border="true"  v-show="propertyKey.indexOf('house_item')>=0"
+				<uni-collapse ref="collapse" accordion class="sys-from-background-color">
+					<uni-collapse-item titleBorder="none" :border="true" v-show="propertyKey.indexOf('house_item')>=0"
 						class="collapse-item-house page-box-bg-fff p-30 r-30">
 						<template v-slot:title>
 							<view class="row-justify-sb center">
@@ -33,7 +33,8 @@
 							<House v-model="houseList" :show-keys="propertyKey" @onResize="onResizeInit"></House>
 						</view>
 					</uni-collapse-item>
-					<uni-collapse-item titleBorder="none" :border="true" v-show="propertyKey.indexOf('car_item')>=0" class="collapse-item-car    p-30 r-30">
+					<uni-collapse-item titleBorder="none" :border="true" v-show="propertyKey.indexOf('car_item')>=0"
+						class="collapse-item-car    p-30 r-30">
 						<template v-slot:title class="page-box-bg-fff">
 							<view class="row-justify-sb center">
 								<view class="row-c">
@@ -49,7 +50,8 @@
 								@onResize="onResizeInit"></property-car>
 						</view>
 					</uni-collapse-item>
-					<uni-collapse-item titleBorder="none" :border="true" v-show="propertyKey.indexOf('insurance_item')>=0"
+					<uni-collapse-item titleBorder="none" :border="true"
+						v-show="propertyKey.indexOf('insurance_item')>=0"
 						class="collapse-item-guarantee  page-box-bg-fff p-30 r-30">
 						<template v-slot:title>
 							<view class="row-justify-sb center">
@@ -96,7 +98,7 @@
 	import PropertyCar from "@/page_task/property/components/car.vue";
 	import PropertyGuarantee from "@/page_task/property/components/guarantee.vue";
 	import PropertyCompany from "@/page_task/property/components/company.vue";
-  import tools from "@/service/tools";
+	import tools from "@/service/tools";
 
 	export default {
 		components: {
@@ -155,23 +157,23 @@
 				}, 200)
 			},
 			onSubmit() {
-        let propertyData=[]
-        for (let i in this.houseList) {
-          propertyData.push(this.houseList[i])
-        }
-        for (let i in this.carList) {
-          propertyData.push(this.carList[i])
-        }
-        for (let i in this.insuranceList) {
-          propertyData.push(this.insuranceList[i])
-        }
-        for (let i in this.firmList) {
-          propertyData.push(this.firmList[i])
-        }
-        uni.$emit('putPropertyInfo',propertyData)
-        setTimeout(()=>{
-          tools.leftClick()
-        },50)
+				let propertyData = []
+				for (let i in this.houseList) {
+					propertyData.push(this.houseList[i])
+				}
+				for (let i in this.carList) {
+					propertyData.push(this.carList[i])
+				}
+				for (let i in this.insuranceList) {
+					propertyData.push(this.insuranceList[i])
+				}
+				for (let i in this.firmList) {
+					propertyData.push(this.firmList[i])
+				}
+				uni.$emit('putPropertyInfo', propertyData)
+				setTimeout(() => {
+					tools.leftClick()
+				}, 50)
 			},
 		}
 	}

page_task/task_details/module/apply.vue

@@ -6,44 +6,38 @@
 					<view class="dot"></view>
 					<text class="sys-weight-600 m-l10">基本信息</text>
 				</view>
-				<view class="sys-from-background-color r-30 p-20 m-t30 row">
-					<view style="width: 50%;">
-            <view class="m-tb16" v-if="applyFor.out_total>0">
-              <text class="text-color-666">批复额度</text>
-              <text class="m-l16">{{applyFor.out_total}}万元</text>
-            </view>
-            <view class="m-tb16" v-if="applyFor.returned_total>0">
-              <text class="text-color-666">回款额度</text>
-              <text class="m-l16">{{applyFor.returned_total}}万元</text>
-            </view>
-
-            <view class="m-tb16" v-if="verifyKey('is_farming')">
-							<text class="text-color-666">是否涉农</text>
-							<text class="m-l16">{{applyFor.is_farming===1?'是':'否'}}</text>
-						</view>
-
-						<view class="row m-tb16" v-if="verifyKey('loan_form')">
-							<text class="text-color-666">贷款类型</text>
-							<text class="m-l16 flex">{{applyFor.loan_form_name}}</text>
-						</view>
-						<view class="row" v-if="verifyKey('loan_industry')">
-							<text class="text-color-666">投向行业</text>
-							<text class="m-l16 flex">{{applyFor.loan_industry_name}}</text>
-						</view>
+				<view class="sys-from-background-color r-30 p-20 m-t30 row apply-message">
+					<view class="row apply-item" v-if="applyFor.out_total>0">
+						<text class="text-color-666">批复额度</text>
+						<text class="m-l16 flex">{{applyFor.out_total}}万元</text>
 					</view>
-					<view class="m-l40" style="width: 50%;">
-						<view class="m-tb16" v-if="verifyKey('loan_type')">
-							<text class="text-color-666">贷款类别</text>
-							<text class="m-l16">{{applyFor.loan_type_name}}</text>
-						</view>
-						<view class="m-b16" v-if="verifyKey('pay_status')">
-							<text class="text-color-666">支付状态</text>
-							<text class="m-l16">{{applyFor.pay_status===1?'已缴纳':'未缴纳'}}</text>
-						</view>
-						<view class="row" v-if="verifyKey('enterprise_type')">
-							<text class="text-color-666">企业类型</text>
-							<text class="m-l16 flex">{{applyFor.enterprise_type_name}}</text>
-						</view>
+					<view class="row apply-item" v-if="applyFor.returned_total>0">
+						<text class="text-color-666">回款额度</text>
+						<text class="m-l16 flex">{{applyFor.returned_total}}万元</text>
+					</view>
+					<view class="row apply-item" v-if="verifyKey('is_farming')">
+						<text class="text-color-666">是否涉农</text>
+						<text class="m-l16 flex">{{applyFor.is_farming===1?'是':'否'}}</text>
+					</view>
+					<view class="row apply-item" v-if="verifyKey('loan_form')">
+						<text class="text-color-666">贷款类型</text>
+						<text class="m-l16 flex">{{applyFor.loan_form_name}}</text>
+					</view>
+					<view class="row apply-item" v-if="verifyKey('loan_industry')">
+						<text class="text-color-666">投向行业</text>
+						<text class="m-l16 flex">{{applyFor.loan_industry_name}}</text>
+					</view>
+					<view class="row apply-item" v-if="verifyKey('loan_type')">
+						<text class="text-color-666">贷款类别</text>
+						<text class="m-l16 flex">{{applyFor.loan_type_name}}</text>
+					</view>
+					<view class="row apply-item" v-if="verifyKey('pay_status')">
+						<text class="text-color-666">支付状态</text>
+						<text class="m-l16">{{applyFor.pay_status===1?'已缴纳':'未缴纳'}}</text>
+					</view>
+					<view class="row apply-item" v-if="verifyKey('enterprise_type')">
+						<text class="text-color-666">企业类型</text>
+						<text class="m-l16 flex">{{applyFor.enterprise_type_name}}</text>
 					</view>
 				</view>
 			</view>
@@ -58,7 +52,8 @@
 						<text>申请类型：</text>
 						<text class="sys-weight-600">{{(applyItem.apply_type*1===1?'抵押':'买卖')}}</text>
 					</view>
-					<view class="sys-background-fff row-justify-sb center r-20 p-30 p-lr40 m-tb20" v-if="applyItem.apply_type*1===2">
+					<view class="sys-background-fff row-justify-sb center r-20 p-30 p-lr40 m-tb20"
+						v-if="applyItem.apply_type*1===2">
 						<view class="column-c color-653400" v-if="verifyKey('transaction')">
 							<text class="sys-weight-600">{{applyItem.transaction}}</text>
 							<text class="size-24">成交价</text>
@@ -75,7 +70,7 @@
 							<text class="sys-weight-600">{{applyItem.reply_type===1?'商业':'组合'}}</text>
 							<text class="size-24">批复类型</text>
 						</view>
-						<view class="column-c color-653400"  v-if="verifyKey('intermediary')">
+						<view class="column-c color-653400" v-if="verifyKey('intermediary')">
 							<text class="sys-weight-600">{{applyItem.intermediary?applyItem.intermediary:'无'}}</text>
 							<text class="size-24">成交中介</text>
 						</view>
@@ -92,7 +87,9 @@
 							<text class="m-l20" v-if="applyItem.apply_type*1===1">还款金额 {{repayment.money}}万元</text>
 						</view>
 						<view class="row-c m-t16">
-							<image class="wh-60" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-put.png" mode=""></image>
+							<image class="wh-60"
+								src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-put.png"
+								mode=""></image>
 							<view class="m-l30">
 								<text class="size-24 text-color-333">{{repayment.bank_name}}</text>
 								<view class="size-28 sys-weight-600 m-t10">{{repayment.bank_num}}</view>
@@ -105,7 +102,9 @@
 							<text class="m-l20">批复金额 {{loan.money}}万</text>
 						</view>
 						<view class="row-c m-t16">
-							<image class="wh-60" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-put.png" mode=""></image>
+							<image class="wh-60"
+								src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-put.png"
+								mode=""></image>
 							<view class="m-l30">
 								<text class="size-24 text-color-333">{{loan.bank_name}}</text>
 								<view class="size-28 sys-weight-600 m-t10">{{loan.bank_num}}</view>
@@ -124,9 +123,9 @@
 			applyFor: {
 				default: {}
 			},
-      appliesKey:{
-        default: []
-      }
+			appliesKey: {
+				default: []
+			}
 		},
 		data() {
 			return {
@@ -145,11 +144,11 @@
 				}]
 			}
 		},
-    methods: {
-      verifyKey(key){
-        return this.appliesKey.indexOf(key)>=0
-      }
-    },
+		methods: {
+			verifyKey(key) {
+				return this.appliesKey.indexOf(key) >= 0
+			}
+		},
 	}
 </script>
 
@@ -187,7 +186,16 @@
 		}
 	}
 
+	.apply-message {
+		flex-wrap: wrap;
+		gap: 10px;
+
+		.apply-item {
+			flex: 0 0 calc(50% - 5px);
+		}
+	}
+
 	.message-box {
 		background: linear-gradient(180deg, #FFEEE4 0%, #FFFFFF 100%);
 	}
-</style>
+</style>

page_task/task_details/module/record.vue

@@ -20,17 +20,18 @@
 					<!-- 自己发送 -->
 					<text> {{ msg.msg }}</text>
 					<view class="image-box">
-						<image class="reply-img wh-60 m-t20 r-10 m-r20" :src="msg_img.url" mode="aspectFill"
-							v-for="(msg_img,index) in msg.msg_img" :key="index"></image>
-						<!--            <en-image :img="msg.msg_img" :width="130" height="130"></en-image>-->
+						<EnImageVideo></EnImageVideo>
 					</view>
 					<!-- 文件类型 -->
 					<view class="sys-from-background-color p-20 r-20 m-t20" v-if="msg.file_list.length>0">
 						<view class="file-item row-c m-b20" @click.stop="openFile(file)"
 							v-for="(file,fileIndex) in msg.file_list" :key="index">
-              <image class="wh-45 m-r20" src="/page_task/static/img/task-details/icon-pdf.png" v-if="file.file_type===1" mode="aspectFill"></image>
-              <image class="wh-45 m-r20" src="page_task//static/img/task-details/icon-word.png" v-else-if="file.file_type===2" mode="aspectFill"> </image>
-              <image class="wh-45 m-r20" src="/page_task/static/img/task-details/icon-excel.png" v-else mode="aspectFill"> </image>
+							<image class="wh-45 m-r20" src="/page_task/static/img/task-details/icon-pdf.png"
+								v-if="file.file_type===1" mode="aspectFill"></image>
+							<image class="wh-45 m-r20" src="page_task//static/img/task-details/icon-word.png"
+								v-else-if="file.file_type===2" mode="aspectFill"> </image>
+							<image class="wh-45 m-r20" src="/page_task/static/img/task-details/icon-excel.png" v-else
+								mode="aspectFill"> </image>
 							<text class="size-24 color-111827">{{ file.name }}</text>
 						</view>
 					</view>
@@ -63,7 +64,8 @@
 				<view class="row-justify-sb center p-lr30 p-t30">
 					<view class="wh-25"></view>
 					<text class="size-30 sys-weight-600">任务反馈</text>
-					<image class="wh-25" src="/page_task/static/img/task-details/close.png" mode="" @click="onClose"></image>
+					<image class="wh-25" src="/page_task/static/img/task-details/close.png" mode="" @click="onClose">
+					</image>
 				</view>
 				<SendChat is_button @butClick="setMsg" v-model="msgData"></SendChat>
 			</view>
@@ -77,14 +79,14 @@
 		getMsgList,
 		setMsg
 	} from "@/api/task";
-	import EnImage from "@/components/en-utils/en-image/en-image.vue";
+	import EnImageVideo from "@/components/en-utils/en-image-video/en-image-video.vue";
 	import tools from "@/service/tools";
 	import EnBlank from "@/components/en-utils/en-blank/en-blank.vue";
 
 	export default {
 		components: {
 			EnBlank,
-			EnImage,
+			EnImageVideo,
 			SendChat
 		},
 		props: {
@@ -238,4 +240,4 @@
 	.file-item:last-child {
 		margin-bottom: 0;
 	}
-</style>
+</style>

page_task/task_details/task_details.vue

@@ -3,7 +3,8 @@
 		<Nav :title="'任务详情'" :genre="2" :fixedHeight="fixedHeight">
 			<view class="task-tabs m-b20" :style=" {top:`${$tools.topHeight()}px`}">
 				<view class="detail-bg m-lr20 m-b10 m-t10">
-					<image class="detail-img" src="/page_task/static/img/task-details/top-bg.png" mode="aspectFill"></image>
+					<image class="detail-img" src="/page_task/static/img/task-details/top-bg.png" mode="aspectFill">
+					</image>
 					<view class="detail-content">
 						<view class="row-c m-l10 m-t16 m-b20 text-color-fff">
 							<image class="wh-45 r-circle" src="/static/img/task-details/head.png" mode="aspectFill">
@@ -15,12 +16,14 @@
 								<text>{{business.age}}岁</text>
 							</view>
 							<view class="row-c size-24 sys-bg-007038 r-100 p-lr16 p-tb6 m-l20">
-								<image class="wh-20" src="/page_task/static/img/task-details/phone-two.png" mode="aspectFill">
+								<image class="wh-20" src="/page_task/static/img/task-details/phone-two.png"
+									mode="aspectFill">
 								</image>
 								<text>{{business.phone}}</text>
 							</view>
 							<image class="wh-60 animate__animated animate__fadeInDownBig" v-if="business.status>0"
-								style="position: absolute;right: 20rpx;" :src="'/page_task/static/img/task-details/icon-'+business.status+'.png'"
+								style="position: absolute;right: 20rpx;"
+								:src="'/page_task/static/img/task-details/icon-'+business.status+'.png'"
 								mode="aspectFill">
 							</image>
 						</view>
@@ -29,7 +32,8 @@
 							<text>{{business.status_name}}</text>
 							<text>{{applyFor.use_date}}用款</text>
 							<view class="row-c">
-								<image class="wh-25 m-r10" src="/page_task/static/img/task-details/usrr.png" mode=""></image>
+								<image class="wh-25 m-r10" src="/page_task/static/img/task-details/usrr.png" mode="">
+								</image>
 								<text>{{business.creation_name}}</text>
 							</view>
 						</view>
@@ -38,18 +42,18 @@
 				<TaskTab :current="current" @onChange="onChange"></TaskTab>
 			</view>
 		</Nav>
-		<view class="details_body sys-list-background-color task-tabs-width"
-			:class=" current === 3 || current === 4?'page-env-20':'page-env-160'"
+		<view class="details_body sys-list-background-color task-tabs-width page-env-160"
 			:style="{top:`${$tools.topHeight()+fixedHeight}px`}">
 			<view class="m-lr20 m-t20">
 				<z-swiper style="width: 95vw;" v-model="list" :options="options" v-if="current === 1">
 					<z-swiper-item>
-						<Identity :business="business" :linkman="linkman" :client-key="clientKey" :linkman-key="linkmanKey"></Identity>
+						<Identity :business="business" :linkman="linkman" :client-key="clientKey"
+							:linkman-key="linkmanKey"></Identity>
 					</z-swiper-item>
 					<z-swiper-item v-show="product.product_types.indexOf('3')>=0">
 						<Apply :apply-for="applyFor" :applies-key="appliesKey"></Apply>
 					</z-swiper-item>
-					<z-swiper-item  v-show="product.product_types.indexOf('4')>=0">
+					<z-swiper-item v-show="product.product_types.indexOf('4')>=0">
 						<ThirdParty :tripartite="tripartite" :tripartite-key="tripartiteKey"></ThirdParty>
 					</z-swiper-item>
 				</z-swiper>
@@ -62,25 +66,30 @@
 				</view>
 			</view>
 			<Record v-show="current === 3" ref="recordObj" :business-id="businessId"></Record>
-			<Steps ref="stepsObj"  v-show="current === 4" :business-id="businessId"></Steps>
+			<Steps ref="stepsObj" v-show="current === 4" :business-id="businessId"></Steps>
 		</view>
-    <view v-if="isExecute>0 && business.status<4">
-      <EnButton v-if="isExecute===3" :text="'领取'"   @onSubmit="takeTask"></EnButton>
-      <EnButton v-else-if="isExecute===2" :is_both="1"  :leftText="'作废'" :rightText="'反馈'"   @onLeftSubmit="cancellation"  @onSubmit="setTaskOperate(3)"></EnButton>
-      <EnButton v-else-if="isExecute===4" :is_both="2"  :leftText="'作废'" :rightText="'反馈'" centre-text="交接"  @onLeftSubmit="cancellation" @onCentreSubmit="openExecute" @onSubmit="setTaskOperate(3)"></EnButton>
-      <EnButton v-else-if="isExecute===5" :text="'完成'"   @onSubmit="endTask"></EnButton>
-      <EnButton v-else-if="isExecute===6" :is_both="1"  :leftText="'拒绝'" :rightText="'同意'"   @onLeftSubmit="auditTask(2)" @onSubmit="auditTask(1)"></EnButton>
-      <EnButton   v-else-if="isExecute===7" text="编辑"  @onSubmit="editTask()"></EnButton>
-      <EnButton   v-else-if="isExecute===8" text="完善贷后"  @onSubmit="setPostLoan()"></EnButton>
-      <EnButton  :is_both="1"  :leftText="'交接'" :rightText="'操作'"  v-else @onLeftSubmit="openExecute"  @onSubmit="setTaskOperate(1)"></EnButton>
+		<view v-if="isExecute>0 && business.status<4">
+			<EnButton v-if="isExecute===3" :text="'领取'" @onSubmit="takeTask"></EnButton>
+			<EnButton v-else-if="isExecute===2" :is_both="1" :leftText="'作废'" :rightText="'反馈'"
+				@onLeftSubmit="cancellation" @onSubmit="setTaskOperate(3)"></EnButton>
+			<EnButton v-else-if="isExecute===4" :is_both="2" :leftText="'作废'" :rightText="'反馈'" centre-text="交接"
+				@onLeftSubmit="cancellation" @onCentreSubmit="openExecute" @onSubmit="setTaskOperate(3)"></EnButton>
+			<EnButton v-else-if="isExecute===5" :text="'完成'" @onSubmit="endTask"></EnButton>
+			<EnButton v-else-if="isExecute===6" :is_both="1" :leftText="'拒绝'" :rightText="'同意'"
+				@onLeftSubmit="auditTask(2)" @onSubmit="auditTask(1)"></EnButton>
+			<EnButton v-else-if="isExecute===7" text="编辑" @onSubmit="editTask()"></EnButton>
+			<EnButton v-else-if="isExecute===8" text="完善贷后" @onSubmit="setPostLoan()"></EnButton>
+			<EnButton :is_both="1" :leftText="'交接'" :rightText="'操作'" v-else @onLeftSubmit="openExecute"
+				@onSubmit="setTaskOperate(1)"></EnButton>
 
-    </view>
-<!--		<EnButton :text="'冲销'" v-if="current === 1"></EnButton>-->
-<!--		<EnButton is_both :leftText="'交接'" :rightText="'操作'"  @onSubmit="setTaskOperate(1)" @onLeftSubmit="openExecute"></EnButton>-->
+		</view>
+		<!--		<EnButton :text="'冲销'" v-if="current === 1"></EnButton>-->
+		<!--		<EnButton is_both :leftText="'交接'" :rightText="'操作'"  @onSubmit="setTaskOperate(1)" @onLeftSubmit="openExecute"></EnButton>-->
 
-    <uni-popup   ref="executePopup" type="bottom">
-      <EnSelect title="请选择任务接收人"  :local-data="executeData" ref="system" v-model="executeId" @setAffirm="setNewExecute"></EnSelect>
-    </uni-popup>
+		<uni-popup ref="executePopup" type="bottom">
+			<EnSelect title="请选择任务接收人" :local-data="executeData" ref="system" v-model="executeId"
+				@setAffirm="setNewExecute"></EnSelect>
+		</uni-popup>
 
 	</view>
 </template>
@@ -100,18 +109,20 @@
 	// 跟进记录
 	import Record from "./module/record.vue"
 	import tools from "@/service/tools";
-  import {
-    cancellation,
-    endTask,
-    getExecuteList,
-    getStageList,
-    getTaskDetail, setExecute, takeTask
-  } from "@/api/task";
-  import EnSelect from "@/components/en-utils/en-select/en-select.vue";
+	import {
+		cancellation,
+		endTask,
+		getExecuteList,
+		getStageList,
+		getTaskDetail,
+		setExecute,
+		takeTask
+	} from "@/api/task";
+	import EnSelect from "@/components/en-utils/en-select/en-select.vue";
 
 	export default {
 		components: {
-      EnSelect,
+			EnSelect,
 			TaskTab,
 			Identity,
 			ThirdParty,
@@ -123,9 +134,9 @@
 		data() {
 			return {
 				current: 1,
-				fixedHeight: 200,
+				fixedHeight: 185,
 				options: {
-					autoHeight: true,
+					// autoHeight: true,
 					centeredSlides: true,
 				},
 				list: [1, 2, 3],
@@ -172,150 +183,151 @@
 					videoList: [],
 				},
 				videoUrl: '',
-        executeId:'',
-        clientKey: [],
-        propertyKey: [],
-        appliesKey: [],
-        tripartiteKey: [],
-        linkmanKey: [],
-        creditKey: [],
+				executeId: '',
+				clientKey: [],
+				propertyKey: [],
+				appliesKey: [],
+				tripartiteKey: [],
+				linkmanKey: [],
+				creditKey: [],
 			}
 		},
 		onLoad(data) {
-      console.log(data)
+			console.log(data)
 			if (data.taskId !== undefined) {
 				this.businessId = data.taskId
 				this.getTaskDetail()
-        uni.$on('newTaskList',()=>{
-          this.getTaskDetail()
-          this.$refs.stepsObj.getStageList()
-        })
+				uni.$on('newTaskList', () => {
+					this.getTaskDetail()
+					this.$refs.stepsObj.getStageList()
+				})
 			} else {
 				tools.leftClick()
 			}
 		},
 		methods: {
-      auditTask(auditType) {
-        uni.navigateTo({
-          url: '/page_task/task_operate/task_operate?businessId='+  this.business.id+'&type=2&auditType='+auditType
-        });
-      },
-      setPostLoan(){
-        uni.navigateTo({
-          url: '/pages-task/task-info/task-loan?id=' +  this.business.id
-        });
-      },
-      editTask() {
-        uni.reLaunch({
-          url: '/pages-task/add-client/new-add?businessId=' + this.business.id
-        })
-      },
-      cancellation() {
-        uni.showModal({
-          title: '提示',
-          content: '是否作废当前任务？',
-          success: (res) => {
-            console.log(res)
-            if (res.confirm) {
+			auditTask(auditType) {
+				uni.navigateTo({
+					url: '/page_task/task_operate/task_operate?businessId=' + this.business.id +
+						'&type=2&auditType=' + auditType
+				});
+			},
+			setPostLoan() {
+				uni.navigateTo({
+					url: '/pages-task/task-info/task-loan?id=' + this.business.id
+				});
+			},
+			editTask() {
+				uni.reLaunch({
+					url: '/pages-task/add-client/new-add?businessId=' + this.business.id
+				})
+			},
+			cancellation() {
+				uni.showModal({
+					title: '提示',
+					content: '是否作废当前任务？',
+					success: (res) => {
+						console.log(res)
+						if (res.confirm) {
 
-              cancellation({
-                'id': this.business.id
-              }).then((res) => {
-                if (res.code === 1) {
-                  this.business.status = 5;
-                  this.isExecute = 0;
-                  tools.success(res.msg)
-                  uni.$emit('newReceiving')
-                } else {
-                  tools.error(res.msg)
-                }
-              })
-            }
-          }
-        });
-      },
-      endTask() {
-        uni.showModal({
-          title: '提示',
-          content: '是否完成当前任务？',
-          success: (res) => {
-            console.log(res)
-            if (res.confirm) {
+							cancellation({
+								'id': this.business.id
+							}).then((res) => {
+								if (res.code === 1) {
+									this.business.status = 5;
+									this.isExecute = 0;
+									tools.success(res.msg)
+									uni.$emit('newReceiving')
+								} else {
+									tools.error(res.msg)
+								}
+							})
+						}
+					}
+				});
+			},
+			endTask() {
+				uni.showModal({
+					title: '提示',
+					content: '是否完成当前任务？',
+					success: (res) => {
+						console.log(res)
+						if (res.confirm) {
 
-              endTask({
-                'id': this.business.id
-              }).then((res) => {
-                if (res.code === 1) {
-                  this.business.status = 4;
-                  this.isExecute = 0;
-                  tools.success(res.msg)
-                  uni.$emit('newReceiving')
-                } else {
-                  tools.error(res.msg)
-                }
-              })
-            }
-          }
-        });
-      },
-      takeTask() {
-        if (this.isAjax) {
-          // return;
-        }
-        this.isAjax = true;
-        takeTask({
-          'id': this.business.id
-        }).then((res) => {
-          if (res.code === 1) {
-            tools.success('领取成功')
-            uni.$emit('newReceiving')
-            this.getTaskDetail()
-          } else {
-            this.isAjax = false;
-            tools.error(res.msg)
-          }
-        })
-      },
-      setNewExecute(type) {
-        if(type){
-          //设置新执行人
-          if(this.executeId<=0){
-            tools.error('请选择执行人')
-            return
-          }
-          setExecute({
-            'business_id': this.businessId,
-            'user_id': this.executeId
-          }).then((res) => {
-            if (res.code === 1) {
-              tools.success(res.msg)
-              uni.$emit('newReceiving')
-              this.getTaskDetail()
+							endTask({
+								'id': this.business.id
+							}).then((res) => {
+								if (res.code === 1) {
+									this.business.status = 4;
+									this.isExecute = 0;
+									tools.success(res.msg)
+									uni.$emit('newReceiving')
+								} else {
+									tools.error(res.msg)
+								}
+							})
+						}
+					}
+				});
+			},
+			takeTask() {
+				if (this.isAjax) {
+					// return;
+				}
+				this.isAjax = true;
+				takeTask({
+					'id': this.business.id
+				}).then((res) => {
+					if (res.code === 1) {
+						tools.success('领取成功')
+						uni.$emit('newReceiving')
+						this.getTaskDetail()
+					} else {
+						this.isAjax = false;
+						tools.error(res.msg)
+					}
+				})
+			},
+			setNewExecute(type) {
+				if (type) {
+					//设置新执行人
+					if (this.executeId <= 0) {
+						tools.error('请选择执行人')
+						return
+					}
+					setExecute({
+						'business_id': this.businessId,
+						'user_id': this.executeId
+					}).then((res) => {
+						if (res.code === 1) {
+							tools.success(res.msg)
+							uni.$emit('newReceiving')
+							this.getTaskDetail()
 
-            } else {
-              tools.error(res.msg)
-            }
-          })
-        }
-        this.$refs.executePopup.close('bottom')
+						} else {
+							tools.error(res.msg)
+						}
+					})
+				}
+				this.$refs.executePopup.close('bottom')
 
-      },
-      openExecute() {
-        this.executeData = [];
-        getExecuteList({
-          'business_id': this.businessId
-        }).then((res) => {
-          if (res.code === 1) {
-            this.executeData=res.data
-            this.$refs.executePopup.open('bottom')
-          }
-        })
-      },
-      setTaskOperate(type){
-          uni.navigateTo({
-            'url':'/page_task/task_operate/task_operate?businessId='+this.businessId+'&type='+type
-          })
-      },
+			},
+			openExecute() {
+				this.executeData = [];
+				getExecuteList({
+					'business_id': this.businessId
+				}).then((res) => {
+					if (res.code === 1) {
+						this.executeData = res.data
+						this.$refs.executePopup.open('bottom')
+					}
+				})
+			},
+			setTaskOperate(type) {
+				uni.navigateTo({
+					'url': '/page_task/task_operate/task_operate?businessId=' + this.businessId + '&type=' + type
+				})
+			},
 			async getTaskDetail() {
 				const res = await getTaskDetail({
 					id: this.businessId
@@ -332,36 +344,36 @@
 					this.stageData = res.data.stageData
 					this.isExecute = res.data.isExecute
 					this.businessFile = res.data.businessFile
-          this.$refs.recordObj.startData()
-          this.setShowKey()
+					this.$refs.recordObj.startData()
+					this.setShowKey()
 				} else {
 					tools.leftClick()
 				}
 			},
-      setShowKey(){
-          this.product.type_data.forEach(item=>{
-            switch (item.type) {
-              case '1':
-                this.clientKey=item.type_keys
-                break;
-              case '2':
-                this.propertyKey=item.type_keys
-                break;
-              case '3':
-                this.appliesKey=item.type_keys
-                break;
-              case '4':
-                this.tripartiteKey=item.type_keys
-                break;
-              case '5':
-                this.linkmanKey=item.type_keys
-                break;
-              case '6':
-                this.creditKey=item.type_keys
-                break;
-            }
-          })
-      },
+			setShowKey() {
+				this.product.type_data.forEach(item => {
+					switch (item.type) {
+						case '1':
+							this.clientKey = item.type_keys
+							break;
+						case '2':
+							this.propertyKey = item.type_keys
+							break;
+						case '3':
+							this.appliesKey = item.type_keys
+							break;
+						case '4':
+							this.tripartiteKey = item.type_keys
+							break;
+						case '5':
+							this.linkmanKey = item.type_keys
+							break;
+						case '6':
+							this.creditKey = item.type_keys
+							break;
+					}
+				})
+			},
 
 			onChange(current) {
 				this.current = current
@@ -421,4 +433,4 @@
 	.swiper-wrapper {
 		z-index: 0 !important;
 	}
-</style>
+</style>

page_task/task_operate/task_operate.vue

@@ -1,52 +1,51 @@
 <template>
-	<view class="total-page page-box">
+	<view class="total-page page-box task-bg">
 		<Nav :title="title" :genre="1" :opacity="scrollTop" is_fixed :bgHeight="bgHeight"></Nav>
 		<view class="operate_body page-env-160" :style="{top:`${$tools.topHeight()}px`}">
 			<view class="sys-background-fff m-lr30 m-t30 m-b20 p-lr30 r-20">
 				<view class="" v-if="type!=='3'">
-					<view class="row-justify-sb center p-tb30 bor-bottom-1 size-28">
+					<view class="row-justify-sb center flex p-tb30 bor-bottom-1 size-28">
 						<view class="wh-text"><text></text>下一阶段处理</view>
-						<view class="row-c flex"  @click="openPopupObj(1)">
-<!--							<input class="wh-input sys-size-28 text-color-12 m-l20 flex"-->
-<!--								placeholder-class="sys-size-28 text-color-999 sys-weight-400" placeholder="请选择"-->
-<!--								v-model="inputValue"></input>-->
-              {{stageData.stageName?stageData.stageName:'请选择任务阶段'}}
+						<view class="center line-34" @click="openPopupObj(1)">
+							<text class="size-28">{{stageData.stageName?stageData.stageName:'请选择任务阶段'}}</text>
+							<uni-icons type="forward" size="18" color="#D8D8D8"></uni-icons>
 						</view>
-						<uni-icons type="forward" size="18" color="#D8D8D8"></uni-icons>
 					</view>
-					<view class="row-justify-sb center p-tb30 bor-bottom-1 size-28"  v-if="selectType<2">
+					<view class="row-justify-sb center p-tb30 bor-bottom-1 size-28" v-if="selectType<2">
 						<view class="wh-text"><text></text>下一执行人员</view>
-						<view class="row-c flex" @click="openPopupObj(2)">
-<!--							<input class="wh-input sys-size-28 text-color-12 m-l20 flex"-->
-<!--								placeholder-class="sys-size-28 text-color-999 sys-weight-400" placeholder="请选择"-->
-<!--								v-model="inputValue"></input>-->
-              {{stageData.userName?stageData.userName:'请选择执行人员'}}
+						<view class="center line-30" @click="openPopupObj(2)">
+							<text class="size-28">{{stageData.userName?stageData.userName:'请选择执行人员'}}</text>
+							<uni-icons type="forward" size="18" color="#D8D8D8"></uni-icons>
 						</view>
-						<uni-icons type="forward" size="18" color="#D8D8D8"></uni-icons>
 					</view>
-          <en-input :label="'回款金额'"  v-if="stageData.operate_ids.indexOf('2')>-1" v-model="businessData.returned_total"  type="digit" placeholder="请输入回款金额" ></en-input>
-          <en-input :label="'出款金额'"  v-if="stageData.operate_ids.indexOf('1')>-1" v-model="businessData.out_total"  type="digit" placeholder="请输入出款金额" ></en-input>
-          <en-input :label="'银行出款'"  v-if="stageData.operate_ids.indexOf('4')>-1" v-model="businessData.bank_total"  type="digit" placeholder="请输入银行出款" ></en-input>
-          <view  v-if="stageData.operate_ids.indexOf('3')>-1">
-            <en-input :label="'回款姓名'"   v-model="businessData.returned_name"  type="text" placeholder="请输入回款人姓名" ></en-input>
-<!--            此处应该是select-->
-            <en-input :label="'银行出款'"  v-model="businessData.returned_bank_id"  :localData="bankData" placeholder="请选择还款银行" ></en-input>
-          </view>
+					<en-input :label="'回款金额'" v-if="stageData.operate_ids.indexOf('2')>-1"
+						v-model="businessData.returned_total" type="digit" placeholder="请输入回款金额"></en-input>
+					<en-input :label="'出款金额'" v-if="stageData.operate_ids.indexOf('1')>-1"
+						v-model="businessData.out_total" type="digit" placeholder="请输入出款金额"></en-input>
+					<en-input :label="'银行出款'" v-if="stageData.operate_ids.indexOf('4')>-1"
+						v-model="businessData.bank_total" type="digit" placeholder="请输入银行出款"></en-input>
+					<view v-if="stageData.operate_ids.indexOf('3')>-1">
+						<en-input :label="'回款姓名'" v-model="businessData.returned_name" type="text"
+							placeholder="请输入回款人姓名"></en-input>
+						<!--            此处应该是select-->
+						<en-input :label="'银行出款'" v-model="businessData.returned_bank_id" :localData="bankData"
+							placeholder="请选择还款银行"></en-input>
+					</view>
 
 				</view>
-<!--				<view class="" v-else>-->
-<!--					<WhInput :name="'冲销类型'" :is_border="false" is_select disabled></WhInput>-->
-<!--				</view>-->
+				<!--				<view class="" v-else>-->
+				<!--					<WhInput :name="'冲销类型'" :is_border="false" is_select disabled></WhInput>-->
+				<!--				</view>-->
 			</view>
 			<view class="sys-background-fff m-lr30 r-20">
-				<SendChat  v-model="msgData" :placeholder="type==='2'?'请输入审核意见~~':'请输入描述~~'"></SendChat>
+				<SendChat v-model="msgData" :placeholder="type==='2'?'请输入审核意见~~':'请输入描述~~'"></SendChat>
 			</view>
 		</view>
-    <view v-show="showExecute">
-      <uni-data-picker class="" :popup-title="popupTitle" :localdata="popupData" ref="popupObj" @change="setNewExecute"
-                       :border="false" :clear-icon="false" @popupclosed="setPopupClosed">
-      </uni-data-picker>
-    </view>
+		<view v-show="showExecute">
+			<uni-data-picker class="" :popup-title="popupTitle" :localdata="popupData" ref="popupObj"
+				@change="setNewExecute" :border="false" :clear-icon="false" @popupclosed="setPopupClosed">
+			</uni-data-picker>
+		</view>
 		<EnButton text="提交" @onSubmit="submit"></EnButton>
 	</view>
 </template>
@@ -54,17 +53,22 @@
 <script>
 	import WhInput from "@/components/en-from/en-input/en-input.vue"
 	import SendChat from "@/page_task/task_details/module/send_chat.vue"
-  import tools from "@/service/tools";
-  import {
-    auditTask, getReturnedBankList,
-    getTaskStage,
-    setExecuteTask, setMsg, setStageOperate
-  } from "@/api/task";
-  import {getStageUser} from "@/api/task";
-  import EnInput from "@/components/en-from/en-input/en-input.vue";
+	import tools from "@/service/tools";
+	import {
+		auditTask,
+		getReturnedBankList,
+		getTaskStage,
+		setExecuteTask,
+		setMsg,
+		setStageOperate
+	} from "@/api/task";
+	import {
+		getStageUser
+	} from "@/api/task";
+	import EnInput from "@/components/en-from/en-input/en-input.vue";
 	export default {
 		components: {
-      EnInput,
+			EnInput,
 			WhInput,
 			SendChat
 		},
@@ -73,275 +77,278 @@
 				bgHeight: 110,
 				scrollTop: 0,
 				is_handle: true,
-        title:'任务反馈',
-        businessId:'',
-        type:'',
-        stageData: {
-          operate_ids:[]
-        },
-        businessData: {
-          'id': '',
-          'manage_id': '',
-          'stage_id': '',
-          'audit_type': '',
-          'msg': '',
-          'msg_img': [],
-          'file_list': [],
-          'returned_total':'',
-          'out_total':'',
-          'bank_total':'',
-          'returned_name':'',
-          'returned_bank_id':'',
-        },
-        msgData:{
-          'msg': '',
-          'msg_img': [],
-          'file_list': [],
-        },
-        users: [],
-        stageList: [],
-        isAudit: false,
-        showExecute: false,
-        popupData: [],
-        popupType: 1,
-        auditType: 0,
-        popupTitle: '',
-        previewList: [],
-        current: 0,
-        selectType: 1,
-        //新增阶段操作数据
-        operateType:1,
-        stageId:0,
-        operateArr:[],
-        operateData:{
-          'returned_total':'',
-          'out_total':'',
-          'returned_bank':'',
-          'returned_bank_id':'',
-        },
-        bankData:[]
+				title: '任务反馈',
+				businessId: '',
+				type: '',
+				stageData: {
+					operate_ids: []
+				},
+				businessData: {
+					'id': '',
+					'manage_id': '',
+					'stage_id': '',
+					'audit_type': '',
+					'msg': '',
+					'msg_img': [],
+					'file_list': [],
+					'returned_total': '',
+					'out_total': '',
+					'bank_total': '',
+					'returned_name': '',
+					'returned_bank_id': '',
+				},
+				msgData: {
+					'msg': '',
+					'msg_img': [],
+					'file_list': [],
+				},
+				users: [],
+				stageList: [],
+				isAudit: false,
+				showExecute: false,
+				popupData: [],
+				popupType: 1,
+				auditType: 0,
+				popupTitle: '',
+				previewList: [],
+				current: 0,
+				selectType: 1,
+				//新增阶段操作数据
+				operateType: 1,
+				stageId: 0,
+				operateArr: [],
+				operateData: {
+					'returned_total': '',
+					'out_total': '',
+					'returned_bank': '',
+					'returned_bank_id': '',
+				},
+				bankData: []
+			}
+		},
+		watch: {
+			'msgData': {
+				handler() {
+					this.businessData.msg = this.msgData.msg
+					this.businessData.msg_img = this.msgData.msg_img
+					this.businessData.file_list = this.msgData.file_list
+				},
+				deep: true
+			}
+		},
+		onLoad(ret) {
+			console.log(ret)
+			if (ret.businessId === undefined) {
+				tools.leftClick()
+			} else {
+				this.businessId = ret.businessId
+				this.type = ret.type
+				console.log(this.type === '2')
+				if (ret.auditType) this.businessData.audit_type = ret.auditType * 1
+				if (this.type === '1') {
+					this.title = '任务反馈'
+				} else if (this.type === '2') {
+					this.title = '任务审核'
+				} else if (this.type === '3') {
+					this.title = '任务执行'
+				} else {
+					this.title = '任务冲销'
+				}
+				this.type = 3
+				this.getTaskStage();
 			}
 		},
-    watch:{
-      'msgData':{
-        handler() {
-          this.businessData.msg=this.msgData.msg
-          this.businessData.msg_img=this.msgData.msg_img
-          this.businessData.file_list=this.msgData.file_list
-        },
-        deep: true
-      }
-    },
-    onLoad(ret) {
-      console.log(ret)
-      if(ret.businessId===undefined){
-        tools.leftClick()
-      }else {
-        this.businessId=ret.businessId
-        this.type=ret.type
-        console.log( this.type==='2')
-        if(ret.auditType)this.businessData.audit_type=ret.auditType*1
-        if(this.type==='1'){
-          this.title='任务反馈'
-        }else if(this.type==='2'){
-          this.title='任务审核'
-        }else if(this.type==='3'){
-          this.title='任务执行'
-        }else {
-          this.title='任务冲销'
-        }
-        this.getTaskStage();
-      }
-    },
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop / 120
 		},
 		methods: {
-      openPopupObj(type) {
-        this.popupType = type;
-        if (type === 1) {
-          if (this.selectType > 2) {
-            tools.error('此阶段不能修')
-            return false;
-          }
-          this.popupTitle = '请选择执行阶段'
-          this.popupData = this.stageList
-        } else {
-          if (this.selectType > 1) {
-            tools.error('此阶段不能修改')
-            return false;
-          }
-          this.popupTitle = '请选择执行人'
-          this.popupData = this.users
-        }
-        this.showExecute = true;
-        this.$refs.popupObj.show();
-      },
-      setPopupClosed() {
-        //关闭选择器
-        this.showExecute = false;
-      },
-      submitOperate(){
-        this.operateData.businessId=this.businessData.id
-        this.operateData.stageId=this.stageId
-        setStageOperate(this.operateData).then((res)=>{
-          if(res.code===1){
-            this.operateData={
-              'returned_total':'',
-              'out_total':'',
-            }
-            this.operateType=1
-            tools.success(res.msg)
-            this.$emit('endTaskSet')
-          }else {
-            tools.error(res.msg)
-          }
-        })
-      },
-      setNewExecute(e) {
-        //设置新执行人
-        let newData = e.detail.value[0]
-        this.showExecute = false;
-        if (this.popupType === 1) {
-          this.businessData.stage_id = newData.value
-          this.stageData.stageName = newData.text
-          this.getStageUser(this.businessData.stage_id)
-          this.stageList.forEach((stage) => {
-            if (stage.value === newData.value) {
-              if (stage.type !== 2  ) {
-                this.selectType = 2
-              }else {
-                this.selectType = 1
-              }
-            }
-          })
-        } else {
-          this.businessData.manage_id = newData.value
-          this.stageData.userName = newData.text
-        }
-      },
-      getStageUser(stage_id){
-        getStageUser({'stage_id':stage_id}).then((res)=>{
-          if(res.code===1){
-            this.users=res.data
-            this.businessData.manage_id =  this.users[0].value
-            this.stageData.userName = this.users[0].text
-          }
-        })
-      },
-      submit() {
-        if (this.type==='2') {
-          this.auditTask()
-        } else if (this.type==='1'){
-          this.setExecuteTask()
-        }else if (this.type==='3'){
-          this.setMsg()
-        }
-      },
-      setEnd(){
-        uni.$emit('newTaskList')
-        setTimeout(()=>{
-          tools.leftClick()
-        },1000)
-      },
-      setMsg() {
-        if (this.isAjax) {
-          return;
-        }
-        // this.isAjax=true;
-        this.msgData.business_id = this.businessId
-        if (this.replyId) {
-          this.msgData.reply_id = this.replyId;
-        }
-        setMsg(this.msgData).then((res) => {
-          if (res.code === 1) {
-            tools.success(res.msg)
-            this.msgData.reply_id = ''
-            this.msgData.msg = ''
-            this.msgData.msg_img = []
-          this.setEnd()
-          } else {
-            tools.error(res.msg)
-            this.isAjax = false;
-          }
+			openPopupObj(type) {
+				this.popupType = type;
+				if (type === 1) {
+					if (this.selectType > 2) {
+						tools.error('此阶段不能修')
+						return false;
+					}
+					this.popupTitle = '请选择执行阶段'
+					this.popupData = this.stageList
+				} else {
+					if (this.selectType > 1) {
+						tools.error('此阶段不能修改')
+						return false;
+					}
+					this.popupTitle = '请选择执行人'
+					this.popupData = this.users
+				}
+				this.showExecute = true;
+				this.$refs.popupObj.show();
+			},
+			setPopupClosed() {
+				//关闭选择器
+				this.showExecute = false;
+			},
+			submitOperate() {
+				this.operateData.businessId = this.businessData.id
+				this.operateData.stageId = this.stageId
+				setStageOperate(this.operateData).then((res) => {
+					if (res.code === 1) {
+						this.operateData = {
+							'returned_total': '',
+							'out_total': '',
+						}
+						this.operateType = 1
+						tools.success(res.msg)
+						this.$emit('endTaskSet')
+					} else {
+						tools.error(res.msg)
+					}
+				})
+			},
+			setNewExecute(e) {
+				//设置新执行人
+				let newData = e.detail.value[0]
+				this.showExecute = false;
+				if (this.popupType === 1) {
+					this.businessData.stage_id = newData.value
+					this.stageData.stageName = newData.text
+					this.getStageUser(this.businessData.stage_id)
+					this.stageList.forEach((stage) => {
+						if (stage.value === newData.value) {
+							if (stage.type !== 2) {
+								this.selectType = 2
+							} else {
+								this.selectType = 1
+							}
+						}
+					})
+				} else {
+					this.businessData.manage_id = newData.value
+					this.stageData.userName = newData.text
+				}
+			},
+			getStageUser(stage_id) {
+				getStageUser({
+					'stage_id': stage_id
+				}).then((res) => {
+					if (res.code === 1) {
+						this.users = res.data
+						this.businessData.manage_id = this.users[0].value
+						this.stageData.userName = this.users[0].text
+					}
+				})
+			},
+			submit() {
+				if (this.type === '2') {
+					this.auditTask()
+				} else if (this.type === '1') {
+					this.setExecuteTask()
+				} else if (this.type === '3') {
+					this.setMsg()
+				}
+			},
+			setEnd() {
+				uni.$emit('newTaskList')
+				setTimeout(() => {
+					tools.leftClick()
+				}, 1000)
+			},
+			setMsg() {
+				if (this.isAjax) {
+					return;
+				}
+				// this.isAjax=true;
+				this.msgData.business_id = this.businessId
+				if (this.replyId) {
+					this.msgData.reply_id = this.replyId;
+				}
+				setMsg(this.msgData).then((res) => {
+					if (res.code === 1) {
+						tools.success(res.msg)
+						this.msgData.reply_id = ''
+						this.msgData.msg = ''
+						this.msgData.msg_img = []
+						this.setEnd()
+					} else {
+						tools.error(res.msg)
+						this.isAjax = false;
+					}
 
-        })
-      },
-      getTaskStage() {
-        getTaskStage({
-          'id': this.businessId
-        }).then((res) => {
-          if (res.code === 1) {
-            this.stageData = res.data.stageData;
-            console.log(this.stageData.operate_ids)
-            if(this.stageData.operate_ids.indexOf('3')>-1){
-              //获取回款银行信息
-              getReturnedBankList().then((bankRes)=>{
-                if(bankRes.code===1){
-                  this.bankData=bankRes.data
-                }
-              })
-            }
-            this.businessData.id = res.data.business.id;
-            this.businessData.manage_id = res.data.business.manage_id;
-            this.businessData.stage_id = res.data.business.stage_id;
-            this.stageId = res.data.business.stage_id;
-            this.users = res.data.users;
-            this.stageList = res.data.stageList;
-            let isNext=false
-            this.stageList.forEach((item)=>{
-              if(res.data.business.stage_id===item.value){
-                isNext=true
-              }else if(isNext){
-                this.businessData.stage_id=item.value
-                this.stageData.stageName=item.text
-                this.getStageUser(this.businessData.stage_id)
-                if (item.type > 2 ) {
-                  this.selectType = 2
-                }else {
-                  this.selectType = 1
-                }
-                isNext=false
-              }
-            })
+				})
+			},
+			getTaskStage() {
+				getTaskStage({
+					'id': this.businessId
+				}).then((res) => {
+					if (res.code === 1) {
+						this.stageData = res.data.stageData;
+						console.log(this.stageData.operate_ids)
+						if (this.stageData.operate_ids.indexOf('3') > -1) {
+							//获取回款银行信息
+							getReturnedBankList().then((bankRes) => {
+								if (bankRes.code === 1) {
+									this.bankData = bankRes.data
+								}
+							})
+						}
+						this.businessData.id = res.data.business.id;
+						this.businessData.manage_id = res.data.business.manage_id;
+						this.businessData.stage_id = res.data.business.stage_id;
+						this.stageId = res.data.business.stage_id;
+						this.users = res.data.users;
+						this.stageList = res.data.stageList;
+						let isNext = false
+						this.stageList.forEach((item) => {
+							if (res.data.business.stage_id === item.value) {
+								isNext = true
+							} else if (isNext) {
+								this.businessData.stage_id = item.value
+								this.stageData.stageName = item.text
+								this.getStageUser(this.businessData.stage_id)
+								if (item.type > 2) {
+									this.selectType = 2
+								} else {
+									this.selectType = 1
+								}
+								isNext = false
+							}
+						})
 
-            if (this.stageData.operateNum > 1) {
-              this.selectType = 3;
-            }
-          } else {
-            tools.error('阶段信息异常')
-          }
-        })
-      },
-      auditTask() {
-        uni.showModal({
-          title: '提示',
-          content: this.businessData.audit_type === 1 ? '是否通过当前任务？' : '是否驳回当前任务？',
-          success: (res) => {
-            if (res.confirm) {
-              auditTask(this.businessData).then((auditRes) => {
-                if (auditRes.code === 1) {
-                  tools.success(auditRes.msg)
-                  this.setEnd()
-                } else {
-                  tools.error(auditRes.msg)
-                }
-              })
-            }
-          }
-        });
-      },
-      setExecuteTask() {
-        setExecuteTask(this.businessData).then((auditRes) => {
-          if (auditRes.code === 1) {
-            tools.success(auditRes.msg)
-            // this.$emit('endTaskSet')
-            this.setEnd()
-          } else {
-            tools.error(auditRes.msg)
-          }
-        })
-      },
+						if (this.stageData.operateNum > 1) {
+							this.selectType = 3;
+						}
+					} else {
+						tools.error('阶段信息异常')
+					}
+				})
+			},
+			auditTask() {
+				uni.showModal({
+					title: '提示',
+					content: this.businessData.audit_type === 1 ? '是否通过当前任务？' : '是否驳回当前任务？',
+					success: (res) => {
+						if (res.confirm) {
+							auditTask(this.businessData).then((auditRes) => {
+								if (auditRes.code === 1) {
+									tools.success(auditRes.msg)
+									this.setEnd()
+								} else {
+									tools.error(auditRes.msg)
+								}
+							})
+						}
+					}
+				});
+			},
+			setExecuteTask() {
+				setExecuteTask(this.businessData).then((auditRes) => {
+					if (auditRes.code === 1) {
+						tools.success(auditRes.msg)
+						// this.$emit('endTaskSet')
+						this.setEnd()
+					} else {
+						tools.error(auditRes.msg)
+					}
+				})
+			},
 
 
 		}
@@ -359,4 +366,4 @@
 		text-align: right;
 		direction: rtl;
 	}
-</style>
+</style>

pages.json

@@ -1,225 +1,225 @@
 {
-  "pages": [
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/login/index",
-      "style": {
-        "navigationBarTitleText": "登陆",
-        "disableScroll": true
-      }
-    },
-    {
-      "path": "pages/login/register",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false,
-        "disableScroll": true
-      }
-    },
-    {
-      "path": "pages/login/forget",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/login/await-audit",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/test/index",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/task/task",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/loan/loan",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/statistics/statistics",
-      "style": {
-        "navigationBarTextStyle": "white"
-      }
-    }
-  ],
-  "subPackages": [
-    {
-      "root": "page_subpack",
-      "pages": [
-        {
-          "path": "system_setting/system_setting",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "message/message",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "personal_details/personal_details",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        }
-      ]
-    },
-    {
-      "root": "page_task",
-      "pages": [
-        {
-          "path": "gain_task/gain_task",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "task_details/task_details",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "creation_task/creation_task",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "information/information",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "identity/identity",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "identity_upload/identity_upload",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "property/property",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "apply/apply",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "task_operate/task_operate",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "tripartite_info/tripartite_info",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "draft/index",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "linkman/linkman",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        }
-      ]
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "万汇融通云",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "navigationStyle": "custom",
-    "backgroundColorBottom": "#EEF1F7"
-  },
-  "tabBar": {
-    "custom": true,
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "text": ""
-      },
-      {
-        "pagePath": "pages/task/task",
-        "text": ""
-      },
-      {
-        "pagePath": "pages/loan/loan",
-        "text": ""
-      },
-      {
-        "pagePath": "pages/statistics/statistics",
-        "text": ""
-      }
-    ],
-    "color": "",
-    "selectedColor": "",
-    "backgroundColor": ""
-  },
-  "preloadRule": {
-    "pages/index/index": {
-      "network": "all",
-      "packages": [
-        "page_subpack",
-        "page_task"
-      ]
-    }
-  },
-  "condition": {
-    "current": 0,
-    "list": [
-      {
-        "name": "添加任务",
-        "path": "/page_task/information/information",
-        "query": "productId=1"
-      },
-      {
-        "name": "任务详情",
-        "path": "/page_task/task_details/task_details",
-        "query": "taskId=4290"
-      }
-    ]
-  }
-}
+	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登陆",
+				"disableScroll": true
+			}
+		},
+		{
+			"path": "pages/login/register",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"disableScroll": true
+			}
+		},
+		{
+			"path": "pages/login/forget",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/await-audit",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/test/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/task/task",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/loan/loan",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/statistics/statistics",
+			"style": {
+				"navigationBarTextStyle": "white"
+			}
+		}
+	],
+	"subPackages": [{
+			"root": "page_subpack",
+			"pages": [{
+					"path": "system_setting/system_setting",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "message/message",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "personal_details/personal_details",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "page_task",
+			"pages": [{
+					"path": "gain_task/gain_task",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "task_details/task_details",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "creation_task/creation_task",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "information/information",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "identity/identity",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "identity_upload/identity_upload",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "property/property",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "apply/apply",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "task_operate/task_operate",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "tripartite_info/tripartite_info",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "draft/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "linkman/linkman",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "credit_upload/credit_upload",
+					"style": {
+						"navigationBarTitleText": "上传征信"
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "万汇融通云",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8",
+		"navigationStyle": "custom",
+		"backgroundColorBottom": "#EEF1F7"
+	},
+	"tabBar": {
+		"custom": true,
+		"list": [{
+				"pagePath": "pages/index/index",
+				"text": ""
+			},
+			{
+				"pagePath": "pages/task/task",
+				"text": ""
+			},
+			{
+				"pagePath": "pages/loan/loan",
+				"text": ""
+			},
+			{
+				"pagePath": "pages/statistics/statistics",
+				"text": ""
+			}
+		],
+		"color": "",
+		"selectedColor": "",
+		"backgroundColor": ""
+	},
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": [
+				"page_subpack",
+				"page_task"
+			]
+		}
+	},
+	"condition": {
+		"current": 0,
+		"list": [{
+				"name": "添加任务",
+				"path": "/page_task/information/information",
+				"query": "productId=1"
+			},
+			{
+				"name": "任务详情",
+				"path": "/page_task/task_details/task_details",
+				"query": "taskId=4290"
+			}
+		]
+	}
+}

pages/index/index.vue

@@ -41,7 +41,7 @@
 				</view>
 			</view>
 			<view class="circle_chart column-sb-c m-t10">
-				<CircleChart ref="circleObj" :width="'180rpx'" :height="'180rpx'" bgColor="#0FB160" ></CircleChart>
+				<CircleChart ref="circleObj" :width="'180rpx'" :height="'180rpx'" bgColor="#0FB160"></CircleChart>
 				<text class="size-24 text-color-12">任务进度</text>
 			</view>
 		</view>
@@ -58,8 +58,13 @@
 	import IndexColumn from "./module/index_column.vue"
 	// 顶部栏目
 	import IndexPersonal from "./module/index_personal.vue"
-  import {getDateBacklogStatistics, getDayBacklogList} from "@/api/task";
-  import {date} from "@/uni_modules/uv-ui-tools/libs/function/test";
+	import {
+		getDateBacklogStatistics,
+		getDayBacklogList
+	} from "@/api/task";
+	import {
+		date
+	} from "@/uni_modules/uv-ui-tools/libs/function/test";
 
 	export default {
 		components: {
@@ -89,87 +94,95 @@
 					color: '#3ABF7D',
 					value: "100%"
 				}, ],
-        memberData:{},
-        statisticsData:{
-          endNum: 0,
-          exceedDate: 0,
-          lagDate: 0,
-          totalNum: 0,
-        },
-        backlogList: [],
-        weekData: [],
-        weekNum: 1,
-        dayNum: 0,
-        day: '',
-        month: '',
-        page: 1,
-        isAjax: false,
-        total: null
+				memberData: {},
+				statisticsData: {
+					endNum: 0,
+					exceedDate: 0,
+					lagDate: 0,
+					totalNum: 0,
+				},
+				backlogList: [],
+				weekData: [],
+				weekNum: 1,
+				dayNum: 0,
+				day: '',
+				month: '',
+				page: 1,
+				isAjax: false,
+				total: null
+			}
+		},
+		watch: {
+			'modelTime': function() {
+				this.startList()
 			}
 		},
-    watch:{
-      'modelTime':function () {
-        this.startList()
-      }
-    },
 		onLoad() {
 			uni.hideTabBar()
 		},
-    onShow() {
-      this.startList()
-    },
+		onShow() {
+			this.startList()
+		},
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop / 120
 		},
 		onReachBottom() {
-      this.getDayBacklogList()
+			this.getDayBacklogList()
 
 		},
 		methods: {
-      getDateBacklogStatistics(){
-        getDateBacklogStatistics({'dateNum':this.modelTime}).then(res=>{
-          if(res.code===1){
-            if(res.data.totalNum>0){
-              this.chartList[0].value=(res.data.exceedNum/res.data.totalNum*100).toFixed(0)*1;
-              this.chartList[1].value=(res.data.lagNum/res.data.totalNum*100).toFixed(0)*1;
-              this.chartList[2].value=(res.data.normalNum/res.data.totalNum*100).toFixed(0)*1;
-              this.$refs.circleObj.setServerData( (res.data.endNum/res.data.totalNum).toFixed(2)*1)
-            }else {
-              this.chartList[0].value=0;
-              this.chartList[1].value=0;
-              this.chartList[2].value=0;
-              this.$refs.circleObj.setServerData( 0)
-            }
-            console.log(this.chartList)
-            this.$refs.pieChart.setData( this.chartList)
+			getDateBacklogStatistics() {
+				getDateBacklogStatistics({
+					'dateNum': this.modelTime
+				}).then(res => {
+					if (res.code === 1) {
+						if (res.data.totalNum > 0) {
+							this.chartList[0].value = (res.data.exceedNum / res.data.totalNum * 100).toFixed(0) *
+								1;
+							this.chartList[1].value = (res.data.lagNum / res.data.totalNum * 100).toFixed(0) * 1;
+							this.chartList[2].value = (res.data.normalNum / res.data.totalNum * 100).toFixed(0) *
+								1;
+							this.$refs.circleObj.setServerData((res.data.endNum / res.data.totalNum).toFixed(2) *
+								1)
+						} else {
+							this.chartList[0].value = 0;
+							this.chartList[1].value = 0;
+							this.chartList[2].value = 0;
+							this.$refs.circleObj.setServerData(0)
+						}
+						console.log(this.chartList)
+						this.$refs.pieChart.setData(this.chartList)
 
 
-          }
-        })
-      },
-      startList(){
-        this.backlogList=[];
-        this.page=1;
-        this.total=null;
-        this.getDayBacklogList();
-        this.getDateBacklogStatistics()
-      },
-      getDayBacklogList() {
-        if(this.total!==null && this.total<=this.backlogList.length){
-          return
-        }
-        getDayBacklogList({'dateNum': this.modelTime,'page':this.page}).then((res) => {
-          if (res.code === 1) {
-            this.backlogList.push(...res.data.items)
-            this.total = res.data.total
-            ++ this.page
-          }
-        })
-      },
+					}
+				})
+			},
+			startList() {
+				this.backlogList = [];
+				this.page = 1;
+				this.total = null;
+				this.getDayBacklogList();
+				this.getDateBacklogStatistics()
+			},
+			getDayBacklogList() {
+				if (this.total !== null && this.total <= this.backlogList.length) {
+					return
+				}
+				getDayBacklogList({
+					'dateNum': this.modelTime,
+					'page': this.page
+				}).then((res) => {
+					if (res.code === 1) {
+						this.backlogList.push(...res.data.items)
+						this.total = res.data.total
+							++this.page
+					}
+				})
+			},
 
-      setMemberData(memberData){
-        this.memberData=memberData
-      },
+			setMemberData(memberData) {
+				this.memberData = memberData
+			},
 			onChangeTime(e) {
 				this.indexTime = e
 			},
@@ -199,4 +212,4 @@
 		height: 16rpx;
 		border-radius: 50%;
 	}
-</style>
+</style>

pages/index/module/index_column.vue

@@ -3,7 +3,9 @@
 		<view class="column_item sys-background-dominant r-30 column-justify-sb" v-if="enteringType===1">
 			<view class="column_build column-c">
 				<view class="row-c" @click="onCreationTask">
-					<image class="wh-80 m-r30" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-add.png" mode="">
+					<image class="wh-80 m-r30"
+						src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-add.png"
+						mode="">
 					</image>
 					<text class="text-color-fff sys-weight-600 size-30">新建任务</text>
 				</view>
@@ -36,13 +38,15 @@
 					<text class="text-color-12 sys-weight-600 size-24 m-l10">今日放款</text>
 				</view>
 				<view class="row-justify-sb center m-t20 line-40">
-					<view class=" row-justify-l" >
-            <en-number :end-num="99" :text-color="'color-02154E'" :text-weight="'sys-weight-600'" :text-size="'size-30'"></en-number>
-            <view class="row-justify-sb center m-t20 line-40 sys-weight-600 color-02154E">万</view>
-            </view>
+					<view class=" row-justify-l">
+						<en-number :end-num="99" :text-color="'color-02154E'" :text-weight="'sys-weight-600'"
+							:text-size="'size-30'"></en-number>
+						<view class="row-justify-sb center line-40 sys-weight-600 color-02154E">万</view>
+					</view>
 					<view class="row-c">
-						<text class="sys-weight-600 " style="color: #02154E;padding-right: 6rpx;">{{moneyData.out_num}}</text>
-						<text class="size-24 text-color-999">笔</text>
+						<en-number :end-num="moneyData.out_num" :text-color="'color-02154E'"
+							:text-weight="'sys-weight-600'" :text-size="'size-30'"></en-number>
+						<text class="size-24 text-color-999 m-l10">笔</text>
 					</view>
 				</view>
 			</view>
@@ -53,10 +57,15 @@
 					<text class="text-color-12 sys-weight-600 size-24 m-l10">今日回款</text>
 				</view>
 				<view class="row-justify-sb center m-t20 line-40">
-					<text class="sys-weight-600" style="color: #02154E;">{{(moneyData.put_money).toFixed(2)}}万</text>
+					<view class=" row-justify-l">
+						<en-number :end-num="moneyData.put_money" :text-color="'color-02154E'"
+							:text-weight="'sys-weight-600'" :text-size="'size-30'"></en-number>
+						<view class="row-justify-sb center line-40 sys-weight-600 color-02154E">万</view>
+					</view>
 					<view class="row-c">
-						<text class="sys-weight-600" style="color: #02154E;padding-right: 6rpx;">{{moneyData.put_num}}</text>
-						<text class="size-24 text-color-999">笔</text>
+						<en-number :end-num="moneyData.put_num" :text-color="'color-02154E'"
+							:text-weight="'sys-weight-600'" :text-size="'size-30'"></en-number>
+						<text class="size-24 text-color-999 m-l10">笔</text>
 					</view>
 				</view>
 			</view>
@@ -64,20 +73,24 @@
 		<view class="column_item m-l20 column-justify-sb">
 			<view class="task_item row-justify center r-30" @click="onGetTask">
 				<view class="m-l40" style="position: relative;">
-					<image class="wh-90 r-circle m-r20" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-task.png" mode="">
+					<image class="wh-90 r-circle m-r20"
+						src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-task.png"
+						mode="">
 					</image>
 					<view class="task_num text-color-fff size-20" style="" v-if="memberData.take_num>0">
-            {{memberData.take_num}}
+						{{memberData.take_num}}
 					</view>
 				</view>
 				<text class="text-color-12 sys-weight-600">领取任务</text>
 			</view>
 			<view class="task_message row-justify center r-30" @click="onMessage">
 				<view class="m-l40" style="position: relative;">
-					<image class="wh-90 r-circle m-r20" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-money.png" mode="">
+					<image class="wh-90 r-circle m-r20"
+						src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-money.png"
+						mode="">
 					</image>
 					<view class="task_num text-color-fff size-20" style="" v-if="memberData.noticeNum>0">
-            {{memberData.noticeNum}}
+						{{Number(memberData.noticeNum)>99?'99+':memberData.noticeNum}}
 					</view>
 				</view>
 				<text class="text-color-12 sys-weight-600">任务消息</text>
@@ -88,81 +101,85 @@
 
 <script>
 	import tools from "@/service/tools";
-  import {getSysCashier} from "@/api/statistics";
-  import EnNumber from "@/components/en-utils/en-number/en-number.vue";
+	import {
+		getSysCashier
+	} from "@/api/statistics";
+	import EnNumber from "@/components/en-utils/en-number/en-number.vue";
 
-  export default {
+	export default {
 		name: 'index_column',
-    components: {EnNumber},
+		components: {
+			EnNumber
+		},
 		props: {
-      memberData:{
-        default:{
-          position_name: "",
-          head_img: "",
-          id: 5,
-          name: "",
-          nickname: "",
-          phone: "",
-          draftNum: "0",
-          creditNum: "0",
-          noticeNum: "0",
-          take_num: "0",
-        }
-      },
+			memberData: {
+				default: {
+					position_name: "",
+					head_img: "",
+					id: 5,
+					name: "",
+					nickname: "",
+					phone: "",
+					draftNum: "0",
+					creditNum: "0",
+					noticeNum: "0",
+					take_num: "0",
+				}
+			},
 			is_admin: {
 				type: Boolean,
 				default: false
 			},
 
-      modelTime:{
-        default: ''
-      }
+			modelTime: {
+				default: ''
+			}
 		},
-    watch:{
-      'modelTime':function () {
+		watch: {
+			'modelTime': function() {
 
-      }
-    },
+			}
+		},
 		data() {
 			return {
-        enteringType:0,
-        moneyData: {
-          out_money: 0,
-          out_num: 0,
-          put_money: 0,
-          put_num: 0,
-        },
-        dateTypeObj: {
-          dateType: 1, //时间类型
-          selectDate: '', //自定义的时候传数组，其它传开始日期
-          money_type: 1,
-          censusUserType: 0,
-        },
+				enteringType: 0,
+				moneyData: {
+					out_money: 0,
+					out_num: 0,
+					put_money: 0,
+					put_num: 0,
+				},
+				dateTypeObj: {
+					dateType: 1, //时间类型
+					selectDate: '', //自定义的时候传数组，其它传开始日期
+					money_type: 1,
+					censusUserType: 0,
+				},
+			}
+		},
+		mounted() {
+			this.enteringType = tools.getEnteringType();
+			if (this.enteringType !== 1) {
+				this.getSysCashier()
 			}
 		},
-    mounted(){
-      this.enteringType=tools.getEnteringType();
-      if(this.enteringType!==1){
-        this.getSysCashier()
-      }
-    },
 		methods: {
-      getSysCashier() {
-        if(this.enteringType===1 || this.modelTime===''){
-          return ''
-        }
-        this.dateTypeObj.selectDate=this.modelTime
-        getSysCashier(this.dateTypeObj).then((res) => {
-          if (res.code === 1) {
-            this.moneyData = res.data
-          }
-        })
-      },
-      onGetDraft(){
-        uni.navigateTo({
-          url: "/page_task/draft/index"
-        })
-      },
+			getSysCashier() {
+				if (this.enteringType === 1 || this.modelTime === '') {
+					return ''
+				}
+				this.dateTypeObj.selectDate = this.modelTime
+				getSysCashier(this.dateTypeObj).then((res) => {
+					if (res.code === 1) {
+						this.moneyData = res.data
+					}
+				})
+			},
+			onGetDraft() {
+				uni.navigateTo({
+					url: "/page_task/draft/index"
+				})
+			},
 			onGetTask() {
 				uni.navigateTo({
 					url: "/page_task/gain_task/gain_task"
@@ -229,7 +246,7 @@
 
 	.column_proceeds {
 		height: 140rpx;
-		background: linear-gradient(180deg, #FFF5DA 0%, rgba(255, 255, 255, 1) 60% , rgba(255, 255, 255, 1) 100%);
+		background: linear-gradient(180deg, #FFF5DA 0%, rgba(255, 255, 255, 1) 60%, rgba(255, 255, 255, 1) 100%);
 	}
 
 	.task_item {
@@ -251,4 +268,4 @@
 		top: -10rpx;
 		line-height: 30rpx;
 	}
-</style>
+</style>

static/css/common.css

@@ -873,6 +873,12 @@
 	transition: .5s ease;
 }
 
+.ellipsis {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
 /*文字排版*/
 .sys-webkit-box {
 	display: -webkit-box;

static/css/default-color.scss

@@ -166,7 +166,7 @@
   color: #718096;
 }
 .color-02154E{
-
+  color: #02154E;
 }