Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/views/auxiliaryFittings/settleAccountManagement/settleAccount/index.vue

@@ -256,9 +256,9 @@ export default {
 		    getDetail({ id: row.settlementOrderId }).then(res => {
 		      Object.assign(this.formData, res.data)
 			  res.data.settlementOrderItemList.forEach(item=>{
-				  this.totalAmount += item.totalAmount
-				  this.workerAmount += item.workerAmount
-				  this.websitAmount += item.websitAmount
+				  this.totalAmount += (item.totalAmount*100 +  this.totalAmount*100)/100
+				  this.workerAmount = (item.workerAmount*100 +  this.workerAmount*100)/100
+				  this.websitAmount += (item.websitAmount*100 +  this.websitAmount*100)/100
 			  })
 		      this.formDialogType = 1
 		      this.openForm()
@@ -307,6 +307,7 @@ export default {
 				if (res.code == 200) {
 					this.$message({ type: 'success', message: `结算成功!` })
 					this.$refs.pageRef.refreshList()
+					this.formDialog = false
 				} else {
 					this.$message.error(res.msg);
 				}
@@ -331,6 +332,7 @@ export default {
 				if (res.code == 200) {
 					this.$message({ type: 'success', message: `提现成功!` })
 					this.$refs.pageRef.refreshList()
+					this.formDialog = false
 				} else {
 					this.$message.error(res.msg);
 				}

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -36,6 +36,15 @@
           <el-input v-model="step1Form.password" type="password" disabled></el-input>
           <el-button class="reset" @click="handleReset()">重置密码</el-button>
         </el-form-item>
+		<el-form-item label="到期时间" prop="companyExpireTime">
+		  <el-date-picker
+		        v-model="step1Form.companyExpireTime"
+		        type="datetime"
+				value-format="yyyy-MM-dd HH:mm:ss"
+		        placeholder="选择日期时间">
+		  </el-date-picker>
+		  <el-button type="primary" @click="saveTime()">保存</el-button>
+		</el-form-item>
         <!-- <el-form-item class="tr">
           <el-button type="primary" @click="submitStep1Form">保存</el-button>
         </el-form-item> -->
@@ -304,6 +313,7 @@
 <script>
 import { getToken } from '@/utils/auth'
 import { getDetail, resetPassword, editAccount } from "@/api/merchant";
+import request from '@/utils/request'
 
 export default {
   data() {
@@ -346,6 +356,7 @@ export default {
         address: '', // 地址
         newPassword: '', // 新密码
         confirmPassword: '', // 确认密码
+		companyExpireTime: ''
       },
 
       passwordType1: 'password',
@@ -464,6 +475,7 @@ export default {
         this.step1Form.email = res.data.email;
         this.step1Form.address = res.data.address;
         this.step1Form.password = '************';
+		this.step1Form.companyExpireTime = res.data.companyExpireTime
 
         this.img1_url = res.data.minLogo1;
         this.img2_url = res.data.minLogo2;
@@ -503,6 +515,22 @@ export default {
       this.passwordType2 = 'password';
       this.$refs.resetForm.resetFields();
     },
+	
+	saveTime(){
+		request({
+			url: '/admin/user/user/updateCompanyWechat',
+			method: 'post',
+			data: {
+				expireTime: this.step1Form.companyExpireTime,
+				companyWechatId: this.companyWechatId
+			}
+		}).then(res =>{
+			if(res.code == 200){
+				this.$successMsg('保存成功');
+				this.getDetail()
+			}
+		})
+	},
 
     // 提交重置密码
     submitResetForm() {

src/views/setting/personal/index.vue

@@ -7,7 +7,7 @@
 			<el-row>
 				<el-col :span="4">
 					<div class="avatar">
-						<fileUpload :multiple="true" :fileList="[{url: userInfo.minLogo3}]" :download="false" :viewOnline="false" :limit="1" @getFiles="getFiles" />
+						<fileUpload :multiple="true" :fileList="[{url: userInfo.minLogo3?userInfo.minLogo3:''}]" :download="false" :viewOnline="false" :limit="1" @getFiles="getFiles" />
 						<!-- <el-image style="width: 100px;height: 100px;border-radius: 50%;" :src="userInfo.minLogo3"></el-image> -->
 						<!-- <div class="img">
 							<i class="el-icon-camera"></i>
@@ -38,30 +38,33 @@
 			</el-row>
 		</div>
 		
-		<div style="margin-top: 60px;width: 50%;">
-			<el-form ref="dialogForm" :model="dialogForm" :rules="dialogFormRules" label-position="left" label-width="80px">
-			  <el-form-item label="原密码" prop="oldPassword">
-			    <el-input v-model="dialogForm.oldPassword" ref="password1" autocomplete="off" placeholder="请输入原密码" :type="passwordType1"></el-input>
-			    <span class="show-pwd" @click="showPwd(1)">
-			      <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
-			    </span>
-			  </el-form-item>
-			  <el-form-item label="新密码" prop="newPassword">
-			    <el-input v-model="dialogForm.newPassword" ref="password2" autocomplete="off" placeholder="请输入新密码" :type="passwordType2"></el-input>
-			    <span class="show-pwd" @click="showPwd(2)">
-			      <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
-			    </span>
-			  </el-form-item>
-			  <el-form-item label="确认密码" prop="confirmPassword">
-			    <el-input v-model="dialogForm.confirmPassword" ref="password3" autocomplete="off" placeholder="请再次输入新密码" :type="passwordType3"></el-input>
-			    <span class="show-pwd" @click="showPwd(3)">
-			      <svg-icon :icon-class="passwordType3 === 'password' ? 'eye' : 'eye-open'" />
-			    </span>
-			  </el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer" style="padding-left: 100px;">
-			  <el-button type="primary" @click="submitDialogForm">保存</el-button>
-			</div>
+		<div style="margin-top: 60px;">
+			<el-card class="goods">
+				<h3>修改密码</h3>
+				<el-form ref="dialogForm" :model="dialogForm" :rules="dialogFormRules" label-position="left" label-width="80px" style="width: 350px;margin-top: 40px;">
+				  <el-form-item label="原密码" prop="oldPassword">
+				    <el-input v-model="dialogForm.oldPassword" ref="password1" autocomplete="off" placeholder="请输入原密码" :type="passwordType1"></el-input>
+				    <span class="show-pwd" @click="showPwd(1)">
+				      <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
+				    </span>
+				  </el-form-item>
+				  <el-form-item label="新密码" prop="newPassword">
+				    <el-input v-model="dialogForm.newPassword" ref="password2" autocomplete="off" placeholder="请输入新密码" :type="passwordType2"></el-input>
+				    <span class="show-pwd" @click="showPwd(2)">
+				      <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
+				    </span>
+				  </el-form-item>
+				  <el-form-item label="确认密码" prop="confirmPassword">
+				    <el-input v-model="dialogForm.confirmPassword" ref="password3" autocomplete="off" placeholder="请再次输入新密码" :type="passwordType3"></el-input>
+				    <span class="show-pwd" @click="showPwd(3)">
+				      <svg-icon :icon-class="passwordType3 === 'password' ? 'eye' : 'eye-open'" />
+				    </span>
+				  </el-form-item>
+				</el-form>
+				<div slot="footer" class="dialog-footer" style="padding-left: 100px;">
+				  <el-button type="primary" @click="submitDialogForm">保存</el-button>
+				</div>
+			</el-card>
 		</div>
 	</div>
 	<renew :userInfo="userInfo" @back="getUserInfo" v-if="isRenew"></renew>
@@ -134,6 +137,9 @@ export default {
   },
   created() {
     this.getUserInfo();
+	if(this.$route.query.isRenew){
+		this.isRenew = true
+	}
   },
   methods: {
     // 获取用户信息