Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

unimall-admin/src/views/circleManagementInfo/index.vue

@@ -82,7 +82,9 @@
 
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ scope.row.status == 0 ? '未审核' : '已通过' }}</span>
+          <span v-if="scope.row.status == 0">未审核</span>
+          <span v-if="scope.row.status == 1">已通过</span>
+          <span v-if="scope.row.status == 3">已驳回</span>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
@@ -100,6 +102,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="handle(scope.row)"
             v-permission="['unimall:circleManagementInfo:edit']" v-if="scope.row.status == '0'">通过</el-button>
+          <el-button size="mini" type="text" @click="handle(scope.row, 1)"
+            v-permission="['unimall:circleManagementInfo:edit']" v-if="scope.row.status == '0'">驳回</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-permission="['unimall:circleManagementInfo:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -160,6 +164,16 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="审核驳回" :visible.sync="isShowhandle">
+      <div>
+        <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea">
+        </el-input>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="isShowhandle = false">取 消</el-button>
+        <el-button type="primary" @click="handleSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -170,6 +184,9 @@ import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
+      selectObj:{},
+      textarea: '',
+      isShowhandle: false,
       imgsFileList: [],
       uploadPath,
       // 遮罩层
@@ -244,7 +261,7 @@ export default {
       }
     },
     handleRemove: function (file, fileList) {
-      this.form.circleHead=""
+      this.form.circleHead = ""
     },
     /** 查询圈子管理列表 */
     getList() {
@@ -268,7 +285,7 @@ export default {
         circleName: undefined,
         circleLabel: undefined,
         status: "0",
-        circleHead:'',
+        circleHead: '',
         gmtCreate: undefined,
         gmtUpdate: undefined,
         deleteFlag: undefined
@@ -297,27 +314,47 @@ export default {
       this.open = true;
       this.title = "添加圈子管理";
     },
-    // 审核
-    handle(row) {
-      console.log(row)
-      debugger
-      circleManagementInfoHandle(row).then(response => {
+    handleSubmit() {
+      this.selectObj.reason = this.textarea
+      this.selectObj.status = 3
+      circleManagementInfoHandle(this.selectObj).then(response => {
         if (response.data) {
-          this.msgSuccess("新增成功");
+          this.msgSuccess("驳回成功！");
+          this.isShowhandle = false 
           this.getList();
         } else {
           this.msgError(response.msg);
         }
       });
     },
+    // 审核
+    handle(row, type) {
+      this.selectObj = row
+      if (type == 1) {
+        this.isShowhandle = true
+      } else {
+        row.status =1
+        circleManagementInfoHandle(row).then(response => {
+          if (response.data) {
+            this.msgSuccess("新增成功");
+            this.getList();
+          } else {
+            this.msgError(response.msg);
+          }
+        });
+      }
+      console.log(row)
+      debugger
+
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       this.imgsFileList = []
       const id = row.id || this.ids.join(',')
       this.imgsFileList.push({
-            url:row.circleHead
-          })
+        url: row.circleHead
+      })
       getCircleManagementInfo(id).then(response => {
         this.form = response.data.data
         this.open = true;

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -1013,8 +1013,9 @@
 				this.remark = this.currectData.remark
 				this.modalShow = true
 			},
-			switchType(item) {
+			switchType(item) {debugger
 				this.type = 2
+				this.typeColumns[0].shift()
 				this.currectData = item
 				this.isShowType = true
 			},
@@ -1238,7 +1239,7 @@
 			},
 			toMap(item) {
 				uni.navigateTo({
-					url: "/pages/cardHolder/map?location=" + item.location
+					url: "/pages/cardHolder/map?val=" + JSON.stringify(item)
 				})
 			},
 		}

xiaochengxu/pages/cardHolder/map.vue

@@ -7,8 +7,8 @@
 				          <cover-view class="container">
 				            <cover-view class="flex-wrp" style="flex-direction:row;">
 				              <cover-view class="flex-item demo-text-1">
-								  <cover-view style="font-weight: bold;">黑龙江中天昊元贸易有限公司</cover-view>
-								   <cover-view style="margin-top: 20rpx;color: #ccc;font-size: 26rpx;display: flex;align-items: center;"><image src="../../static/location.png" mode="widthFix" style="width: 20px;margin-right: 20rpx;"></image>辽宁省营口市皱鱼圈区青龙山大街8号</cover-view>
+								  <cover-view style="font-weight: bold;font-size: 28rpx;">{{dataObj.companyName}}</cover-view>
+								   <cover-view style="margin-top: 24rpx;color: rgba(128, 128, 128, 1);;font-size: 24rpx;display: flex;align-items: center;"><image src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/point.png" mode="widthFix" style="width: 20px;margin-right: 24rpx;"></image>{{dataObj.province}}{{dataObj.city}}{{dataObj.area}}{{dataObj.detailedAddress}}</cover-view>
 							  </cover-view>
 				            </cover-view>
 				          </cover-view>
@@ -27,11 +27,20 @@
 				title: 'map',
 				latitude: 39.909,
 				longitude: 116.39742,
-				covers: []
+				covers: [],
+				dataObj:{
+					companyName:'',
+					area:'',
+					city:'',
+					province:'',
+					detailedAddress:''
+				}
 			}
 		},
 		onLoad(options) {
-			var location=options.location.split(',')
+			this.dataObj = JSON.parse(options.val)
+			
+			let location=this.dataObj.location.split(',')
 			this.latitude=location[0]
 			this.longitude=location[1]
 			this.covers = [
@@ -64,14 +73,14 @@
 
 .flex-item{
   width: calc(100vw - 40rpx);
-  height: 140rpx;
+  height: 150rpx;
   font-size: 26rpx;
 }
 
 .demo-text-1 {
   background: #fff;
   border-radius: 20rpx;
-  padding: 20rpx 40rpx;
+  padding: 24rpx;
   box-sizing: border-box;
 }
 

xiaochengxu/pages/circle/circle.vue

@@ -36,7 +36,7 @@
 				</view>
 				<view class="row-tiem flex" v-if="!item.name" @click="toDetail(item.id)">
 					<view class="left">
-						<image :src="item.circleHead?item.circleHead:'../../static/imgs/mySet/ewm.png'" mode="widthFix" class="img"></image>
+						<image :src="item.circleHead?item.circleHead:'../../static/imgs/mySet/ewm.png'" mode="aspectFill" class="img"></image>
 					</view>
 					<view class="right">
 						<view class="top">{{item.circleName}}（{{item.cardNum}}）</view>
@@ -75,8 +75,6 @@
 			};
 		},
 		onLoad() {
-		},
-		onShow() {
 			// this.searchVal = uni.getStorageSync("cirlce_search_val") ? uni.getStorageSync("cirlce_search_val") : ''
 			this.userInfo = uni.getStorageSync("userInfo")
 			this.$nextTick(function() {
@@ -100,6 +98,9 @@
 				this.cardList = res.data.items.filter((item)=>{return item.status==0})
 				console.log(this.cardList)
 			})
+		},
+		onShow() {
+		
 		},
 		methods: {
 			delSearchVal() {

xiaochengxu/pages/circle/createCirclce.vue

@@ -12,8 +12,8 @@
 				选择名片
 			</view>
 			<view style="font-size:12px;padding-right:20rpx;" class='flex align-item-center' @click="cardShow">
-			{{formData.cardBusiness?formData.cardBusiness:'暂无名片'}}
-			<u-icon v-if='!formData.cardBusiness' name="arrow-right" size="12"></u-icon>
+			{{formData.cardBusiness}}
+			<u-icon name="arrow-right" size="12"></u-icon>
 			</view>
 		</view>
 		<view class="row1">
@@ -25,7 +25,7 @@
 				<view v-for="(item,index) in labelList":key="index">
 					<view>
 						<view class="flex">
-							<u-input placeholder="请输入圈子标签，2-4个字" border="none" v-model="item.labelName" @change="change"
+							<u-input placeholder="请输入圈子标签，2-6个字" border="none" v-model="item.labelName" @change="change"
 							:customStyle="custom">
 							<template slot="suffix">
 								<image src="../../static/imgs/mySet/del.png" mode="widthFix" style="width: 40rpx;" @click="subtract(index)"></image>
@@ -64,18 +64,6 @@
 				labelList: [{
 						labelName: '',
 					},
-					{
-						labelName: '',
-					},
-					{
-						labelName: '',
-					},
-					{
-						labelName: '',
-					},
-					{
-						labelName: '',
-					},
 					{
 						labelName: '',
 					}
@@ -84,6 +72,7 @@
 					circleName: '',
 					circleLabel: [],
 					commonId: '',
+					cardBusiness:''
 				},
 				currectData:{}
 			};
@@ -108,6 +97,7 @@
 			}).then(res => {
 				uni.hideLoading()
 				this.cardList = [res.data.items]
+				this.formData.cardBusiness  = res.data.items[0].cardBusiness
 			})
 		},
 		methods: {
@@ -141,10 +131,10 @@
 						})
 						return
 					}
-					if (this.labelList[i].labelName.length > 4 || this.labelList[i].labelName.length < 2) {
+					if (this.labelList[i].labelName.length > 6 || this.labelList[i].labelName.length < 2) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: '标签内容2-4个字！',
+							message: '标签内容2-6个字！',
 						})
 						return
 					}
@@ -163,18 +153,20 @@
 				}).then(res => {
 					this.$refs.uToast.show({
 						type: 'success',
-						message: '提交成功！',
+						message: '信息审核中，请留意消息通知！',
+						back:true,
+						duration:3000
 					})
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 500)
 				})
+				setTimeout(() => {
+					uni.navigateBack()
+				}, 3000)
 			},
 			add() {
-				if (this.labelList.length > 3) {
+				if (this.labelList.length > 5) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: '“标签数量2-4个！',
+						message: '“标签数量2-6个！',
 					})
 					return
 				}
@@ -186,7 +178,7 @@
 				if (this.labelList.length < 3) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: '“标签数量2-4个！',
+						message: '“标签数量2-6个！',
 					})
 					return
 				}

xiaochengxu/pages/circle/detail.vue

@@ -3,7 +3,7 @@
 		<view class="bgc">
 			<view class="content1">
 				<view class="left">
-					<image :src="dataObj.circleHead?dataObj.circleHead:'../../static/imgs/mySet/ewm.png'" mode="widthFix" class="img"></image>
+					<image :src="dataObj.circleHead?dataObj.circleHead:'../../static/imgs/mySet/ewm.png'" mode="aspectFill" class="img"></image>
 				</view>
 				<view class="right">
 					<view  class="top flex flex-between">
@@ -421,6 +421,8 @@
 
 	.img {
 		width: 122rpx;
+		height: 122rpx;
+		border-radius: 10px;
 		margin-right: 30rpx;
 	}