浏览代码

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

高敬炎 2 年之前
父节点
当前提交
fba6a53238

+ 3 - 1
unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardHolderInfo.java

@@ -119,7 +119,9 @@ public class CardHolderInfo extends SuperDO {
     /** 头像 */
     @TableField(exist = false)
     private String headSculpture;
-
+    /** 图标 */
+    @TableField(exist = false)
+    private String icon;
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 5 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardManagementInfo.java

@@ -105,6 +105,11 @@ public class CardManagementInfo extends SuperDO {
     @TableField("cuttent_template")
     private String cuttentTemplate;
 
+    /** 图标 */
+    @Excel(name = "图标")
+    @TableField("icon")
+    private String icon;
+
     /** 置顶标识 */
     @Excel(name = "置顶标识")
     @TableField("top_marking")

+ 1 - 0
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardHolderInfoMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cmi.qr_code as qrCode,
         cmi.current_background as currentBackground,
         cmi.cuttent_template as cuttentTemplate,
+        cmi.icon as icon,
         phi.id as personalHomeId,
         cui.share_card as shareCard,
         chi.gmt_update AS gmtUpdate,

+ 12 - 12
xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -59,17 +59,17 @@
 									{{item.companyName}}
 								</view>
 								<view class="row3 flex" @click="toMap(item)">
-									<u--image :showLoading="true" src="/static/imgs/card/address1.png" width="13px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
 										height="16px"></u--image>
 									<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 								</view>
 								<view @click="freeTell(item)" class="row4 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
 										height="13px"></u--image>
 									<view class='icon-text'>{{ item.phone }}</view>
 								</view>
 								<view @click='remarkEdit(item)' class="row2 flex" style="color: #808080">
-									<u--image :showLoading="true" src="/static/imgs/card/remark1.png" width="10px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
 										height="12px"></u--image>
 									<view class='icon-text' style="color: #808080;">{{item.remark?item.remark:'单击添加备注'}}
 									</view>
@@ -92,17 +92,17 @@
 									{{item.companyName}}
 								</view>
 								<view @click="toMap(item)" class="row3 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/address3.png" width="13px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
 										height="16px"></u--image>
 									<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 								</view>
 								<view @click="freeTell(item)" class="row4 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/phone3.png" width="12px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
 										height="13px"></u--image>
 									<view class='icon-text'>{{ item.phone }}</view>
 								</view>
 								<view @click='remarkEdit(item)' class="row2 flex" style="color: #808080">
-									<u--image :showLoading="true" src="/static/imgs/card/remark3.png" width="10px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
 										height="12px"></u--image>
 									<view class='icon-text' style="color: #808080;">{{item.remark?item.remark:'单击添加备注'}}
 									</view>
@@ -140,17 +140,17 @@
 								</view>
 								<view class="right">
 									<view @click="toMap(item)" class="row1 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/address1.png" width="13px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
 											height="16px"></u--image>
 										<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
 									<view @click="freeTell(item)" class="row2 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
 											height="13px"></u--image>
 										<view class='icon-text'>{{ item.phone }}</view>
 									</view>
 									<view @click='remarkEdit(item)' class="row2 flex" style="color: #808080">
-										<u--image :showLoading="true" src="/static/imgs/card/remark1.png" width="10px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
 											height="12px"></u--image>
 										<view class='icon-text' style="color: #808080;">
 											{{item.remark?item.remark:'单击添加备注'}}
@@ -185,17 +185,17 @@
 								</view>
 								<view class="right">
 									<view @click="toMap(item)" class="row1 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/address2.png" width="13px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
 											height="16px"></u--image>
 										<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
 									<view @click="freeTell(item)" class="row2 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/phone2.png" width="12px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
 											height="13px"></u--image>
 										<view class='icon-text'>{{ item.phone }}</view>
 									</view>
 									<view @click='remarkEdit(item)' class="row2 flex" style="color: #808080">
-										<u--image :showLoading="true" src="/static/imgs/card/remark2.png" width="10px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
 											height="12px"></u--image>
 										<view :style='item.remark?"color:#000;":"color:#808080;"' class='icon-text'>
 											{{item.remark?item.remark:'单击添加备注'}}

+ 214 - 305
xiaochengxu/pages/circle/changeCard.vue

@@ -5,17 +5,15 @@
 			<span @click='switchStatus(2)' :class='status==2?"active":""' class='default'>黑名单</span>
 		</view>
 		<view class="content2 ">
-			<view v-for='(item,index) in cardList' class="item">
-				<!-- <view class="card-list-item" style="background:red"> -->
-				
+			<view class="row" v-for="(item,index) in cardList" :key="index">
 				<view class="card-list-item"
 					:style="item.cardManagementInfo.currentBackground?'background:url('+item.cardManagementInfo.currentBackground+');background-size:100% 100%':''">
-				<view class="card-content style1" v-if="item.cardManagementInfo.cuttentTemplate==1">
-							<view class="left">
-							<u--image :showLoading="true" :src="item.cardManagementInfo.headSculpture" width="66px" height="66px"
+					<view class="card-content style1" v-if="item.cardManagementInfo.cuttentTemplate==1">
+						<view class="left">
+							<u--image :showLoading="true" :src="item.cardManagementInfo.headSculpture?item.cardManagementInfo.headSculpture:'/static/imgs/card/defaulthead.png'" width="66px" height="66px"
 								shape="circle"></u--image>
 						</view>
-						 <view class="right">
+						<view class="right">
 							<view class="row1">
 								<text class="name">{{item.cardManagementInfo.name}}</text>
 								<text class="post">{{item.cardManagementInfo.post}}</text>
@@ -23,18 +21,23 @@
 							<view class="row2">
 								{{item.cardManagementInfo.companyName}}
 							</view>
-							<view class="row3 flex" @click="">
-								<u--image :showLoading="true" src="/static/imgs/card/address1.png"  width="13px" height="16px"
-									 ></u--image>
-									 <view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+							<view class="row3 flex">
+								<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.cardManagementInfo.icon+'.png'" width="13px"
+									height="16px"></u--image> <view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+							</view>
+							<view class="row4 flex">
+								<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.cardManagementInfo.icon+'.png'" width="12px"
+									height="13px"></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
 							</view>
 							<view class="row4 flex">
-								<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px" height="13px"
-									></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+								<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.cardManagementInfo.icon+'.png'" width="10px"
+									height="12px"></u--image><view class='icon-text'>{{item.cardManagementInfo.remark?item.cardManagementInfo.remark:'--'}}</view>
 							</view>
+							<!-- <view class="">
+								备注
+							</view> -->
 						</view>
-					</view> 
-					
+					</view>
 					<view class="card-content style1 flex-between" v-if="item.cardManagementInfo.cuttentTemplate==2">
 						<view class="right">
 							<view class="row1">
@@ -45,14 +48,20 @@
 								{{item.cardManagementInfo.companyName}}
 							</view>
 							<view class="row3 flex">
-								<u--image :showLoading="true" src="/static/imgs/card/address3.png"  width="13px" height="16px"
-									></u--image>
-									<view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+								<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.cardManagementInfo.icon+'.png'" width="13px"
+									height="16px"></u--image><view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+							</view>
+							<view class="row4 flex">
+								<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.cardManagementInfo.icon+'.png'" width="12px"
+									height="13px"></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
 							</view>
 							<view class="row4 flex">
-								<u--image :showLoading="true" src="/static/imgs/card/phone3.png" width="12px" height="13px"
-								></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+								<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.cardManagementInfo.icon+'.png'" width="10px"
+									height="12px"></u--image><view class='icon-text'>{{item.cardManagementInfo.remark?item.cardManagementInfo.remark:'--'}}</view>
 							</view>
+							<!-- <view class="">
+								备注
+							</view> -->
 						</view>
 						<view class="left">
 							<u--image :showLoading="true" :src="item.cardManagementInfo.headSculpture" width="66px" height="66px"
@@ -60,7 +69,6 @@
 							<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px"
 								height="66px" shape="circle" v-else></u--image>
 						</view>
-
 					</view>
 					<view class="card-content style2" v-if="item.cardManagementInfo.cuttentTemplate==3">
 						<view class="top">
@@ -80,13 +88,17 @@
 								</view>
 							</view>
 							<view class="right">
-								<view class="row1 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/address1.png"  width="13px" height="16px"
-									></u--image><view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+								<view class="row3 flex">
+									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.cardManagementInfo.icon+'.png'" width="13px"
+										height="16px"></u--image><view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+								</view>
+								<view class="row4 flex">
+									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.cardManagementInfo.icon+'.png'" width="12px"
+										height="13px"></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
 								</view>
-								<view class="row2 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px" height="13px"
-										></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+								<view class="row4 flex">
+									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.cardManagementInfo.icon+'.png'" width="10px"
+										height="12px"></u--image><view class='icon-text'>{{item.cardManagementInfo.remark?item.cardManagementInfo.remark:'--'}}</view>
 								</view>
 							</view>
 						</view>
@@ -100,127 +112,51 @@
 							<view class="row2">
 								{{item.cardManagementInfo.companyName}}
 							</view>
-			
+						
 						</view>
 						<view class="bottom flex">
 							<view class="left">
 								<u--image :showLoading="true" :src="item.cardManagementInfo.headSculpture" width="66px" height="66px"
 									shape="circle" v-if="item.cardManagementInfo.headSculpture"></u--image>
-								<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png"
-									width="66px" height="66px" shape="circle" v-else></u--image>
+								<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px"
+									height="66px" shape="circle" v-else></u--image>
 							</view>
 							<view class="right">
-								<view class="row1 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/address2.png" width="13px" height="16px"
-										 ></u--image><view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+								<view class="row3 flex">
+									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.cardManagementInfo.icon+'.png'" width="13px"
+										height="16px"></u--image><view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
 								</view>
-								<view class="row2 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/phone2.png" width="12px" height="13px"
-										 ></u--image><view  class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+								<view class="row4 flex">
+									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.cardManagementInfo.icon+'.png'" width="12px"
+										height="13px"></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+								</view>
+								<view class="row4 flex">
+									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.cardManagementInfo.icon+'.png'" width="10px"
+										height="12px"></u--image><view class='icon-text'>{{item.cardManagementInfo.remark?item.cardManagementInfo.remark:'--'}}</view>
 								</view>
-
 							</view>
 						</view>
 					</view>
-					<view class="status-btns" v-if="item.status==0">
-						<span class='status-btn' @click='cardExchangeInfoEdit(1,item)'> 拉黑</span>
-						<span class='status-btn error' @click='cardExchangeInfoEdit(2,item)'>拒绝</span>
-						<span class='status-btn success' @click='cardExchangeInfoEdit(3,item)'>接受</span>
+					<view class="car-bottom flex">
+						<view class="status-btns" v-if="item.status==0">
+							<span class='status-btn' @click='cardExchangeInfoEdit(1,item)'> 拉黑</span>
+							<span class='status-btn error' @click='cardExchangeInfoEdit(2,item)'>拒绝</span>
+							<span class='status-btn success' @click='cardExchangeInfoEdit(3,item)'>接受</span>
 						
-					</view>
-					<view class="status-btns" v-else>
-						<span class='status' v-if="item.status==1">已接受</span>
-						<span class='status' v-if="item.status==3">已拒绝</span>
-						<span class='status' v-if="item.status==5">已过期</span>
-						<span v-if="item.status==7" class='status-btn' @click='cardExchangeInfoEdit(4,item)'>移除</span>
-					</view>
-				</view>
-				<view style='margin:0 20rpx;' class="flex flex-between">
-					<span>来自 {{item.circleName}}</span>
-					<span> {{parseTime(item.gmtCreate)}}</span>
-				</view>
-				<!-- <view class="left">
-					<view class="top flex-row-center">
-						<image :src="item.headSculpture" mode="widthFix" class="img"></image>
-					</view>
-					<view class="bottom flex flex-evenly">
-						<uni-icons @click="toHome(item)" type="home" size="20"></uni-icons>
-						<text @click='switchType(item)'>{{item.classify?item.classifyName:'默'}}</text>
-						<uni-icons @click='share(item)' type="redo" size="20" color=''></uni-icons>
-					</view>
-				</view>
-				<view class="right">
-					<view class="row1 flex">
-						<text>{{item.name}}</text>
-						<text class="line"></text>
-						<text>{{item.post}}</text>
-						<u-checkbox-group v-if='islongPress' placement="column"
-							@change="checkboxChange($event,index)">
-							<u-checkbox :name='index+1' :checked='item.checked'
-								:customStyle="{marginBottom: '8px'}">
-							</u-checkbox>
-						</u-checkbox-group>
-					</view>
-					<view class="row2">
-						{{item.companyName}}
-					</view>
-					<view class="row3" @click="toMap(item)">
-						<uni-icons type="redo" size="20"></uni-icons>
-						<text>{{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</text>
-					</view>
-					<view class="row3">
-						<uni-icons type="redo" size="20"></uni-icons>
-						<text>{{item.phone}}</text>
-					</view>
-					<view @click='remarkEdit(item)' class="row3">
-						<uni-icons type="redo" size="20"></uni-icons>
-						<text>{{item.remark?item.remark:'单击添加备注'}}</text>
-					</view>
-				</view> -->
-			</view>
-			<!--< view class="row" v-for="(item,index) in cardList" :key="index">
-				<view class="flex">
-					<view class="left">
-						<view class="top flex-row-center">
-							<image :src="item.cardManagementInfo.headSculpture" mode="widthFix" class="img"></image>
-						</view>
-					</view>
-					<view class="right">
-						<view class="row1 flex">
-							<text>{{item.cardManagementInfo.name}}</text>
-							<text class="line"></text>
-							<text>{{item.cardManagementInfo.post}}</text>
-						</view>
-						<view class="row2">
-							{{item.cardManagementInfo.companyName}}
-						</view>
-						<view class="row3" @click="toMap">
-							<uni-icons type="redo" size="20"></uni-icons>
-							<text>{{item.cardManagementInfo.detailedAddress}}</text>
 						</view>
-						<view class="row3">
-							<uni-icons type="redo" size="20"></uni-icons>
-							<text>{{item.cardManagementInfo.phone}}</text>
+						<view class="status-btns" v-else>
+							<span class='status' v-if="item.status==1">已接受</span>
+							<span class='status' v-if="item.status==3">已拒绝</span>
+							<span class='status' v-if="item.status==5">已过期</span>
+							<span v-if="item.status==7" class='status-btn' @click='cardExchangeInfoEdit(4,item)'>移除</span>
 						</view>
 					</view>
 				</view>
-				<view class="" v-if="item.status==0">
-					<span @click='cardExchangeInfoEdit(1,item)'> 拉黑</span>
-					<span @click='cardExchangeInfoEdit(2,item)'>拒绝</span>
-					<span @click='cardExchangeInfoEdit(3,item)'>接受</span>
-					<span @click='cardExchangeInfoEdit(4,item)'>移除</span>
-				</view>
-				<view class="" v-else>
-					<span v-if="item.status==1">已接受</span>
-					<span v-if="item.status==3">已拒绝</span>
-					<span v-if="item.status==5">已过期</span>
-					<span v-if="item.status==7">已拉黑</span>
-				</view>
-				<view class="flex flex-between">
-					<span>来至 {{item.circleName}}</span>
+				<view style='margin:0 20rpx;color:#666666;font-size: 26rpx;' class="flex flex-between">
+					<span>来自: {{item.circleName}}</span>
 					<span> {{parseTime(item.gmtCreate)}}</span>
 				</view>
-			</view> -->
+			</view>
 		</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -230,33 +166,35 @@
 	export default {
 		data() {
 			return {
-				userInfo:{},
-				status:1,
-				cardList:[{cardManagementInfo:{}}],
+				userInfo: {},
+				status: 1,
+				cardList: [{
+					cardManagementInfo: {}
+				}],
 			};
 		},
 		onLoad() {
 			this.userInfo = uni.getStorageSync("userInfo")
 			this.getList()
 		},
-		methods:{
-			switchStatus(status){
-				this.status=status
+		methods: {
+			switchStatus(status) {
+				this.status = status
 				this.getList()
 			},
-			getList(){
+			getList() {
 				uni.showLoading({
 					title: '数据加载中'
 				})
 				this.$request.baseRequest('admin.unimall.cardExchangeInfo', 'list', {
-					receiveId:this.userInfo.id,
-					status:this.status
+					receiveId: this.userInfo.id,
+					status: this.status
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 					uni.hideLoading()
 				}).then(res => {
@@ -264,27 +202,27 @@
 					this.cardList = res.data.items
 				})
 			},
-			cardExchangeInfoEdit(type,val){
+			cardExchangeInfoEdit(type, val) {
 				uni.showLoading({
 					title: '数据加载中'
 				})
 				this.$request.baseRequest('admin.unimall.cardExchangeInfo', 'update', {
-					cardExchangeInfo:JSON.stringify(val),
-					updateFlag:type
+					cardExchangeInfo: JSON.stringify(val),
+					updateFlag: type
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 					uni.hideLoading()
 				}).then(res => {
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"success",
-					  title: '操作成功!',
-					  duration: 2000
+						icon: "success",
+						title: '操作成功!',
+						duration: 2000
 					});
 					this.getList()
 				})
@@ -300,80 +238,54 @@
 		box-sizing: border-box;
 		border-radius: 0px 0px 20rpx 20rpx;
 	}
-	// .content2 {
-	// 	margin-top:-112rpx;
-	// 	border: 1px solid #ccc;
-	// 	border-radius: 30rpx;
-	// 	padding: 40rpx;
-	// 	box-sizing: border-box;
 
-	// 	.left {
-	// 		width: 30%;
-
-	// 		.top {
-				
-	// 			margin-bottom: 20rpx;
-	// 		}
-	// 		.img {
-	// 			width: 80%;
-	// 		}
-
-	// 		.bottom {
-	// 		}
-	// 	}
-
-	// 	.right {
-	// 		.row1 {
-	// 			.line {
-	// 				width: 1px;
-	// 				height: 20px;
-	// 				margin: 0 20rpx;
-	// 				background: black;
-	// 			}
-	// 		}
-	// 	}
-	// }
-	.default{
-		color:rgba(255, 255, 255, 0.5);
-		font-size:26rpx;
-		padding:20rpx;
-		position:relative;
+	
+	.default {
+		color: rgba(255, 255, 255, 0.5);
+		font-size: 26rpx;
+		padding: 20rpx;
+		position: relative;
 	}
-	.active{
-		color:#fff;
-		font-size:32rpx;
+
+	.active {
+		color: #fff;
+		font-size: 32rpx;
 	}
-	.active:after{
-		content:'';
-		display:block;
-		width:10px;
-		height:2px;
-		background:#fff;
+
+	.active:after {
+		content: '';
+		display: block;
+		width: 10px;
+		height: 2px;
+		background: #fff;
 		position: absolute;
 		left: 50%;
 		transform: translateX(-50%);
 		bottom: 0;
 	}
+
 	.content2 {
-		// padding:0 20rpx;
 		position: relative;
 		top: -144rpx;
-	
+		padding: 20rpx;
+		.icon-text{
+			margin-left:10rpx;
+		}
 		.style1 {
 			display: flex;
 			padding: 20rpx 30rpx;
 			width: 85%;
-			margin-bottom: 90rpx;
-	
+			margin-bottom: 70rpx;
+
 			.left {
 				width: 132rpx;
 				height: 132rpx;
 				border-radius: 50%;
 			}
-	
+
 			.right {
 				margin-left: 40rpx;
-	
+
 				.row1 {
 					.name {
 						font-size: 38rpx;
@@ -381,37 +293,34 @@
 						color: #040000;
 						margin-right: 20rpx;
 					}
-	
+
 					.post {
 						font-size: 26rpx;
 						font-weight: 500;
 						color: #666666;
 					}
 				}
-	
+
 				.row2 {
+					margin-top: 20rpx;
 					font-size: 24rpx;
 					font-weight: bold;
 					color: #323333;
 				}
-	
-				.row3 {
+
+				.row3,.row4 {
 					margin-top: 30rpx;
 					font-size: 24rpx;
 					font-weight: 500;
 					color: #323333;
-	
-				}
-				.row2,.row4 {
-					margin-top: 10rpx;
+
 				}
 			}
 		}
-	
+
 		.style2 {
 			padding: 30rpx;
-			margin-bottom: 100rpx;
-	
+
 			.top {
 				.row1 {
 					.name {
@@ -420,28 +329,29 @@
 						color: #040000;
 						margin-right: 20rpx;
 					}
-	
+
 					.post {
 						font-size: 26rpx;
 						font-weight: 500;
 						color: #666666;
 					}
 				}
-	
+
 				.row2 {
-					margin-top: 10rpx;
+					margin-top: 20rpx;
 					font-size: 24rpx;
 					font-weight: bold;
 					color: #323333;
 				}
+				
 			}
-	
+
 			.bottom {
-				margin-top: 48rpx;
-	
+				margin-top: 20rpx;
+
 				.left {
 					margin-right: 40rpx;
-	
+
 					.row1 {
 						.name {
 							font-size: 38rpx;
@@ -449,127 +359,126 @@
 							color: #040000;
 							margin-right: 20rpx;
 						}
-	
+
 						.post {
 							font-size: 26rpx;
 							font-weight: 500;
 							color: #666666;
 						}
 					}
-	
+
 					.row2 {
-						margin-top: 10rpx;
+						margin-top: 20rpx;
 						font-size: 24rpx;
 						font-weight: bold;
 						color: #323333;
 					}
-					
 				}
-	
+
 				.right {
-	
+
 					.row1,
 					.row2 {
 						font-size: 24rpx;
 						font-weight: 500;
 						color: #323333;
 					}
-	
-					.row2,.row4 {
-						margin-top: 10rpx;
+
+					.row2 {
+						margin-top: 20rpx;
+					}
+					.row3,.row4 {
+						margin-top: 30rpx;
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #323333;
+					
 					}
 				}
 			}
-	
+
 		}
-	
-		.card-list-item {
-			width: calc(100%);
-			// left:-20rpx;
-			position: relative;
-			border-radius: 30rpx;
-			padding: 40rpx;
-			box-sizing: border-box;
-	
-			.car-bottom {
-				position: absolute;
-				bottom: 63rpx;
-				left: 20rpx;
-				bottom:24rpx;
-				width:94.9%;
-				background: url("../../static/imgs/card/bg5.png") no-repeat center;
-				background-size: 100% 100%;
-				height: 80rpx;
-				// width: calc(100% - 40rpx);
-				.left {
-					// top: -40rpx;
-					position: absolute;
-					padding: 20rpx 0;
-					width: 70vw;
-					height: 80rpx;
-					box-sizing: border-box;
-					display: flex;
-					align-items: center;
-					justify-content: space-evenly;
-					z-index:100;
-					left: 0px;
-					
-					// background-size: 100% 100%;
-					overflow-y: hidden;
-				}
+	}
+
+	.card-list {
+		padding: 0 20rpx;
+
+		.title-name {
+			font-weight: bold;
+			color: #19191A;
+			margin: 20rpx 0;
+		}
+	}
+
+	.card-list-item {
+		width: calc(100% + 40rpx);
+		left: -20rpx;
+		position: relative;
+		border-radius: 30rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+
+		.car-bottom {
+			justify-content: flex-end;
+		}
+
+		.left {
+			width: 30%;
+
+			.top {
+
+				margin-bottom: 20rpx;
 			}
-	
-			.left {
-				width: 30%;
-	
-				.top {
-	
-					margin-bottom: 20rpx;
-				}
-	
-				.img {
-					width: 80%;
-				}
-	
-				.bottom {}
+
+			.img {
+				width: 80%;
 			}
-	
-			.right {
-				.row1 {
-					.line {
-						width: 1px;
-						height: 20px;
-						margin: 0 20rpx;
-						background: black;
-					}
+
+			.bottom {}
+		}
+
+		.right {
+			.row1 {
+				.line {
+					width: 1px;
+					height: 20px;
+					margin: 0 20rpx;
+					background: black;
 				}
 			}
 		}
-	
 	}
-	.icon-text{
+
+	.icon-text {
 		margin-left: 10px;
 		font-size: 24rpx;
 		font-weight: 500;
 		color: #323333;
 	}
-	.status-btns{
-		margin:10rpx 0 25rpx;
-		text-align:right;
+
+	.status-btns {
+		margin: 10rpx 0 25rpx;
+		
 	}
-	.status-btns span{
-		background:#fff;
-		border:1px solid rgba(0, 0, 0, 0.20);
-		padding:10rpx 30rpx;
-		font-size:26rpx;
+
+	.status-btns span {
+		margin-right: 10rpx;
+		border-radius: 10rpx;
+		background: #fff;
+		border: 1px solid rgba(0, 0, 0, 0.20);
+		padding: 10rpx 30rpx;
+		font-size: 26rpx;
 	}
-	.status{
-		color:#666;
+
+	.status {
+		color: #666;
 	}
-	.error{
-		color:#FF4E4E;
+
+	.error {
+		color: #FF4E4E;
 	}
-	.success{
-		color:#279D2A;
+
+	.success {
+		color: #279D2A;
 	}
-</style>
+</style>

+ 9 - 4
xiaochengxu/pages/circle/detail.vue

@@ -325,6 +325,11 @@
 					// this.makeData(res.data)
 					if (page.num == 1) this.changeCardList = []; //如果是第一页需手动置空列表
 					this.changeCardList = this.changeCardList.concat(curPageData); //追加新数据
+					for(let i = 0;i<this.changeCardList.length;i++){
+						if(this.changeCardList[i].scopeOfBusiness&&this.changeCardList[i].scopeOfBusiness.length>90){
+							 this.changeCardList[i].scopeOfBusiness = this.changeCardList[i].scopeOfBusiness.substr(0,90) + '...' ;
+						}
+					}
 				})
 			},
 			async upCallback(page) {
@@ -488,8 +493,7 @@
 		border-radius: 30rpx;
 		background: red;
 		box-sizing: border-box;
-		margin: 0 20rpx 20rpx 20rpx;
-		height:381rpx;
+		height:400rpx;
 		.item {
 			align-items: flex-start;
 			padding: 34rpx 40rpx 0 40rpx;
@@ -527,7 +531,8 @@
 		}
 
 		.bottom {
-			padding: 20rpx 40rpx 40rpx 40rpx;
+			padding: 20rpx 60rpx 0rpx 60rpx;
+			font-size: 26rpx;
 		}
 
 		.btn {
@@ -539,7 +544,7 @@
 			border-radius: 32rpx;
 			position: absolute;
 			top: 35rpx;
-			right: 23rpx;
+			right: 40rpx;
 
 
 		}

+ 12 - 13
xiaochengxu/pages/mySet/myInfo.vue

@@ -23,15 +23,15 @@
 									{{item.companyName}}
 								</view>
 								<view class="row3 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/address1.png" width="13px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
 										height="16px"></u--image> <view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 								</view>
 								<view class="row4 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
 										height="13px"></u--image><view class='icon-text'>{{ item.phone }}</view>
 								</view>
 								<view class="row4 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/remark1.png" width="10px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
 										height="12px"></u--image><view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
 								</view>
 								<!-- <view class="">
@@ -49,15 +49,15 @@
 									{{item.companyName}}
 								</view>
 								<view class="row3 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/address3.png" width="13px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
 										height="16px"></u--image><view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 								</view>
 								<view class="row4 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/phone3.png" width="12px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
 										height="13px"></u--image><view class='icon-text'>{{ item.phone }}</view>
 								</view>
 								<view class="row4 flex">
-									<u--image :showLoading="true" src="/static/imgs/card/remark3.png" width="10px"
+									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
 										height="12px"></u--image><view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
 								</view>
 								<!-- <view class="">
@@ -90,15 +90,15 @@
 								</view>
 								<view class="right">
 									<view class="row3 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/address1.png" width="13px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
 											height="16px"></u--image><view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
 									<view class="row4 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
 											height="13px"></u--image><view class='icon-text'>{{ item.phone }}</view>
 									</view>
 									<view class="row4 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/remark1.png" width="10px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
 											height="12px"></u--image><view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
 									</view>
 								</view>
@@ -124,15 +124,15 @@
 								</view>
 								<view class="right">
 									<view class="row3 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/address2.png" width="13px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
 											height="16px"></u--image><view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
 									<view class="row4 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/phone2.png" width="12px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
 											height="13px"></u--image><view class='icon-text'>{{ item.phone }}</view>
 									</view>
 									<view class="row4 flex">
-										<u--image :showLoading="true" src="/static/imgs/card/remark2.png" width="10px"
+										<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
 											height="12px"></u--image><view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
 									</view>
 								</view>
@@ -159,7 +159,6 @@
 							<!-- <button @click="toEditCard(item)">编辑</button> -->
 						</view>
 					</view>
-			
 				</view>
 			</view>
 			<view class="upload flex flex-all-center" @click="addCard">