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

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardClassifyInfoService.java

@@ -41,9 +41,6 @@ public interface ICardClassifyInfoService{
 	@HttpMethod(description = "置顶",  permissionName = "名片分类管理")
 	public Boolean top(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
 
-	@HttpMethod(description = "置顶默认分类",  permissionName = "名片分类管理")
-	public Boolean topDefault(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
-
 	@HttpMethod(description = "修改",  permissionName = "名片分类管理")
 	public Boolean update(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardClassifyInfoServiceImpl.java

@@ -98,32 +98,17 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService {
         CardClassifyInfo cardClassifyInfo1 = cardClassifyInfoMapper.selectById(cardClassifyInfo.getId());
         List<CardClassifyInfo> cardClassifyInfoList = cardClassifyInfoMapper.selectList(new EntityWrapper<CardClassifyInfo>()
                 .eq("common_id", cardClassifyInfo1.getCommonId())
+                .orderBy("top_marking", false)
                 .eq("delete_flag", 0));
+        Integer sort=0;
         if (!CollectionUtils.isEmpty(cardClassifyInfoList)) {
-            for (CardClassifyInfo aa : cardClassifyInfoList) {
-                aa.setTopMarking(0l);
-                cardClassifyInfoMapper.updateById(aa);
-            }
+            sort=cardClassifyInfoList.get(0).getTopMarking()+1;
         }
-        cardClassifyInfo1.setTopMarking(1l);
+        cardClassifyInfo1.setTopMarking(sort);
         cardClassifyInfo1.setGmtUpdate(new Date());
         return cardClassifyInfoMapper.updateById(cardClassifyInfo1) > 0;
     }
 
-    @Override
-    public Boolean topDefault(CardClassifyInfo cardClassifyInfo) throws ServiceException {
-        List<CardClassifyInfo> cardClassifyInfoList = cardClassifyInfoMapper.selectList(new EntityWrapper<CardClassifyInfo>()
-                .eq("common_id", cardClassifyInfo.getCommonId())
-                .eq("delete_flag", 0));
-        if (!CollectionUtils.isEmpty(cardClassifyInfoList)) {
-            for (CardClassifyInfo aa : cardClassifyInfoList) {
-                aa.setTopMarking(0l);
-                cardClassifyInfoMapper.updateById(aa);
-            }
-        }
-        return true;
-    }
-
     @Override
     public Boolean update(CardClassifyInfo cardClassifyInfo) throws ServiceException {
         Date now = new Date();

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/commonUser/CommonUserServiceImpl.java

@@ -13,10 +13,12 @@ import com.iotechn.unimall.core.notify.SMSResult;
 import com.iotechn.unimall.core.util.GeneratorUtil;
 import com.iotechn.unimall.core.util.SHA1Util;
 import com.iotechn.unimall.data.component.CacheComponent;
+import com.iotechn.unimall.data.domain.CardClassifyInfo;
 import com.iotechn.unimall.data.domain.UserDO;
 import com.iotechn.unimall.data.domain.CommonUserInfo;
 import com.iotechn.unimall.data.dto.UserDTO;
 import com.iotechn.unimall.data.enums.UserLoginType;
+import com.iotechn.unimall.data.mapper.CardClassifyInfoMapper;
 import com.iotechn.unimall.data.mapper.UserMapper;
 import com.iotechn.unimall.data.util.SessionUtil;
 import okhttp3.OkHttpClient;
@@ -53,6 +55,8 @@ public class CommonUserServiceImpl implements CommonUserService {
 
     @Autowired
     private CommonUserInfoMapper commonUserInfoMapper;
+    @Autowired
+    private CardClassifyInfoMapper cardClassifyInfoMapper;
 
 
     @Autowired
@@ -90,6 +94,18 @@ public class CommonUserServiceImpl implements CommonUserService {
                 commonUserInfoMapper.insert(newUserDO);
                 //更新数据库默认值
                 newUserDO = commonUserInfoMapper.selectById(newUserDO.getId());
+                List<CardClassifyInfo> cardClassifyInfoList = cardClassifyInfoMapper.selectList(new EntityWrapper<CardClassifyInfo>()
+                        .eq("common_id", newUserDO.getId())
+                        .eq("delete_flag", 0));
+                //新创建的用户添加默认分类
+                if (CollectionUtils.isEmpty(cardClassifyInfoList)) {
+                    CardClassifyInfo cardClassifyInfo=new CardClassifyInfo();
+                    cardClassifyInfo.setGmtCreate(now);
+                    cardClassifyInfo.setGmtUpdate(now);
+                    cardClassifyInfo.setCommonId(newUserDO.getId());
+                    cardClassifyInfo.setCircleName("默认分类");
+                    cardClassifyInfoMapper.insert(cardClassifyInfo);
+                }
             } else {
                 newUserDO = list.get(0);
             }

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardClassifyInfo.java

@@ -38,10 +38,10 @@ public class CardClassifyInfo extends SuperDO {
     @TableField("circle_name")
     private String circleName;
 
-    /** 置顶标识 */
-    @Excel(name = "置顶标识")
+    /** 排序 */
+    @Excel(name = "排序")
     @TableField("top_marking")
-    private Long topMarking;
+    private Integer topMarking;
 
     /**  */
     @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")

xiaochengxu/components/Card/Card.vue

@@ -0,0 +1,454 @@
+<template>
+	<view class="card">
+		<view class="card-list" v-if="list">
+			<view v-for='(item,index) in list' class="item flex">
+				<view class="card-list-item"
+					:style="'background:url('+item.currentBackground+');background-size:100% 100%;width:100%'">
+					<view class="card-content style1" v-if="item.cuttentTemplate==0">
+						<view class="left">
+							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
+								shape="circle"></u--image>
+						</view>
+						<view class="right">
+							<view class="row1">
+								<text class="name">{{item.name}}</text>
+								<text class="post">{{item.post}}</text>
+							</view>
+							<view class="row2">
+								{{item.companyName}}
+							</view>
+							<view class="row3 flex">
+								<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
+									color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+							</view>
+							<view class="row4 flex">
+								<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
+									color="#5e6d82"></uni-icons>{{ item.phone }}
+							</view>
+							<!-- <view class="">
+								备注
+							</view> -->
+						</view>
+					</view>
+					<view class="card-content style1 flex-between" v-if="item.cuttentTemplate==1">
+						<view class="right">
+							<view class="row1">
+								<text class="name">{{item.name}}</text>
+								<text class="post">{{item.post}}</text>
+							</view>
+							<view class="row2">
+								{{item.companyName}}
+							</view>
+							<view class="row3 flex">
+								<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
+									color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+							</view>
+							<view class="row4 flex">
+								<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
+									color="#5e6d82"></uni-icons>{{ item.phone }}
+							</view>
+							<!-- <view class="">
+								备注
+							</view> -->
+						</view>
+						<view class="left">
+							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
+								shape="circle" v-if="item.headSculpture"></u--image>
+							<u--image :showLoading="true" src="defaulthead.png" width="66px" height="66px"
+								shape="circle" v-else></u--image>
+						</view>
+					</view>
+					<view class="card-content style2" v-if="item.cuttentTemplate==2">
+						<view class="top">
+							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
+								shape="circle" v-if="item.headSculpture"></u--image>
+							<u--image :showLoading="true" src="defaulthead.png" width="66px" height="66px"
+								shape="circle" v-else></u--image>
+						</view>
+						<view class="bottom flex">
+							<view class="left">
+								<view class="row1">
+									<text class="name">{{item.name}}</text>
+									<text class="post">{{item.post}}</text>
+								</view>
+								<view class="row2">
+									{{item.companyName}}
+								</view>
+							</view>
+							<view class="right">
+								<view class="row1 flex">
+									<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
+										color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+								</view>
+								<view class="row2 flex">
+									<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
+										color="#5e6d82"></uni-icons>{{ item.phone }}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="card-content style2" v-if="item.cuttentTemplate==3">
+						<view class="top">
+							<view class="row1">
+								<text class="name">{{item.name}}</text>
+								<text class="post">{{item.post}}</text>
+							</view>
+							<view class="row2">
+								{{item.companyName}}
+							</view>
+
+						</view>
+						<view class="bottom flex">
+							<view class="left">
+								<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
+									shape="circle" v-if="item.headSculpture"></u--image>
+								<u--image :showLoading="true" src="defaulthead.png" width="66px" height="66px"
+									shape="circle" v-else></u--image>
+							</view>
+							<view class="right">
+								<view class="row1 flex">
+									<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
+										color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+								</view>
+								<view class="row2 flex">
+									<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
+										color="#5e6d82"></uni-icons>{{ item.phone }}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="car-bottom flex">
+						<view class="left" :style='styleList[0]'>
+							
+						</view>
+						<view class="right" :style='styleList[1]'>
+					
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="card-obj" v-if="obj">
+			<view class="card-list-item" :style="'background:url('+obj.currentBackground+');background-size:100% 100%'">
+				<view class="card-content style1" v-if="obj.cuttentTemplate==0">
+					<view class="left">
+						<u--image :showLoading="true" :src="obj.headSculpture" width="66px" height="66px"
+							shape="circle"></u--image>
+					</view>
+					<view class="right">
+						<view class="row1">
+							<text class="name">{{obj.name}}</text>
+							<text class="post">{{obj.post}}</text>
+						</view>
+						<view class="row2">
+							{{obj.companyName}}
+						</view>
+						<view class="row3 flex">
+							<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
+								color="#5e6d82"></uni-icons>{{ obj.province }}{{ obj.city }}{{ obj.area }}
+						</view>
+						<view class="row4 flex">
+							<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
+								color="#5e6d82"></uni-icons>{{ obj.phone }}
+						</view>
+					</view>
+				</view>
+				<view class="card-content style1 flex-between" v-if="obj.cuttentTemplate==1">
+					<view class="right">
+						<view class="row1">
+							<text class="name">{{obj.name}}</text>
+							<text class="post">{{obj.post}}</text>
+						</view>
+						<view class="row2">
+							{{obj.companyName}}
+						</view>
+						<view class="row3 flex">
+							<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
+								color="#5e6d82"></uni-icons>{{ obj.province }}{{ obj.city }}{{ obj.area }}
+						</view>
+						<view class="row4 flex">
+							<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
+								color="#5e6d82"></uni-icons>{{ obj.phone }}
+						</view>
+					</view>
+					<view class="left">
+						<u--image :showLoading="true" :src="obj.headSculpture" width="66px" height="66px" shape="circle"
+							v-if="obj.headSculpture"></u--image>
+						<u--image :showLoading="true" src="./defaulthead.png" width="66px" height="66px" shape="circle"
+							v-else></u--image>
+					</view>
+				</view>
+				<view class="card-content style2" v-if="obj.cuttentTemplate==2">
+					<view class="top">
+						<u--image :showLoading="true" :src="obj.headSculpture" width="66px" height="66px" shape="circle"
+							v-if="obj.headSculpture"></u--image>
+						<u--image :showLoading="true" src="./defaulthead.png" width="66px" height="66px" shape="circle"
+							v-else></u--image>
+					</view>
+					<view class="bottom flex">
+						<view class="left">
+							<view class="row1">
+								<text class="name">{{obj.name}}</text>
+								<text class="post">{{obj.post}}</text>
+							</view>
+							<view class="row2">
+								{{obj.companyName}}
+							</view>
+						</view>
+						<view class="right">
+							<view class="row1 flex">
+								<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
+									color="#5e6d82"></uni-icons>{{ obj.province }}{{ obj.city }}{{ obj.area }}
+							</view>
+							<view class="row2 flex">
+								<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
+									color="#5e6d82"></uni-icons>{{ obj.phone }}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="card-content style2" v-if="obj.cuttentTemplate==3">
+					<view class="top">
+						<view class="row1">
+							<text class="name">{{obj.name}}</text>
+							<text class="post">{{obj.post}}</text>
+						</view>
+						<view class="row2">
+							{{obj.companyName}}
+						</view>
+
+					</view>
+					<view class="bottom flex">
+						<view class="left">
+							<u--image :showLoading="true" :src="obj.headSculpture" width="66px" height="66px"
+								shape="circle" v-if="obj.headSculpture"></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">
+								<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
+									color="#5e6d82"></uni-icons>{{ obj.province }}{{ obj.city }}{{ obj.area }}
+							</view>
+							<view class="row2 flex">
+								<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
+									color="#5e6d82"></uni-icons>{{ obj.phone }}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="car-bottom flex">
+					<view class="left" :style='styleList[0]'>
+					</view>
+					<view class="right" :style='styleList[1]'>
+					</view>
+				</view>
+
+			</view>
+		</view>
+
+
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "Card",
+		props: {
+			obj: {
+				type: Object,
+				required: true
+			},
+			list: {
+				type: Array,
+				required: true
+			},
+			styleList: {
+				type: Array,
+				required: true
+			},
+			page: {
+				type: String,
+				required: true
+			}
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {
+			list(newVal, oldVal) {
+
+			}
+		},
+		mounted() {},
+
+		methods: {}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.style1 {
+		display: flex;
+		padding: 20rpx 30rpx;
+		width: 85%;
+		margin-bottom: 90rpx;
+
+		.left {
+			width: 132rpx;
+			height: 132rpx;
+			border-radius: 50%;
+		}
+
+		.right {
+			margin-left: 40rpx;
+
+			.row1 {
+				.name {
+					font-size: 38rpx;
+					font-weight: bold;
+					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 {
+				margin-top: 30rpx;
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #323333;
+
+			}
+		}
+	}
+
+	.style2 {
+		padding: 50rpx 30rpx;
+		margin-bottom: 100rpx;
+
+		.top {
+			.row1 {
+				.name {
+					font-size: 38rpx;
+					font-weight: bold;
+					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;
+			}
+		}
+
+		.bottom {
+			margin-top: 48rpx;
+
+			.left {
+				margin-right: 40rpx;
+
+				.row1 {
+					.name {
+						font-size: 38rpx;
+						font-weight: bold;
+						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;
+				}
+			}
+
+			.right {
+
+				.row1,
+				.row2 {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #323333;
+				}
+
+				.row2 {
+					margin-top: 20rpx;
+				}
+			}
+		}
+
+	}
+
+	.card-list-item {
+		position: relative;
+		border-radius: 30rpx;
+		padding: 40rpx 40rpx 0 40rpx;
+		box-sizing: border-box;
+
+		.car-bottom {
+			position: relative;
+			bottom: 60rpx;
+			left: -20rpx;
+		}
+
+		.left {
+			width: 30%;
+
+			.top {
+
+				margin-bottom: 20rpx;
+			}
+
+			.img {
+				width: 80%;
+			}
+
+			.bottom {}
+		}
+
+		.right {
+			.row1 {
+				.line {
+					width: 1px;
+					height: 20px;
+					margin: 0 20rpx;
+					background: black;
+				}
+			}
+		}
+	}
+</style>

xiaochengxu/pages.json

@@ -107,7 +107,7 @@
 		}, {
 			"path": "pages/mySet/myHome",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "主页信息",
 				"enablePullDownRefresh": false
 			}
 

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -14,7 +14,9 @@
 					<uni-icons type="closeempty" size="24" @click.native.stop="delSearchVal"
 						v-if="searchVal"></uni-icons>
 				</view>
+				
 				<view class="right">
+					<uni-icons type="closeempty" size="24" @click.native.stop="delVal" color="#9199af" v-if="searchVal"></uni-icons>
 					<uni-icons type="mic" size="24" @click.native.stop="micOpen" color="#9199af"></uni-icons>
 				</view>
 			</view>
@@ -50,7 +52,7 @@
 								<view class="row2">
 									{{item.companyName}}
 								</view>
-								<view class="row3 flex">
+								<view class="row3 flex" @click="">
 									<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
 										color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
 								</view>
@@ -347,6 +349,10 @@
 			};
 		},
 		methods: {
+			delVal(){
+				this.searchVal =""
+				this.mescroll.resetUpScroll()
+			},
 			handleHiddenShare(){
 				console.log(11111)
 				this.popupshow=false

xiaochengxu/pages/cardHolder/scanCodeAddCard.vue

@@ -1,8 +1,15 @@
 <template>
 	<view>
-		<view class="content1">
+		<view class="card-wrap">
+			<card :obj="cardInfo" :styleList="bottomStyle" page="scanCodeAddCard"></card>
+			<view class="row-text">
+				<text>默</text>
+			</view>
+		</view>
+
+		<!-- 		<view class="content1">
+			
 			<view class="left">
-				<image src="../../static/c3.png" mode="widthFix" class="img"></image>
 			</view>
 			<view class="right">
 				<view class="row1">
@@ -21,54 +28,70 @@
 					备注{{cardInfo.remark?cardInfo.remark:''}}
 				</view>
 			</view>
+		</view> -->
+		<view class="title">
+			名片信息
+		</view>
+		<view class="form-style">
+			<view class="row" style="border-bottom: 1px solid #E6E5E5;padding-bottom: 20rpx;">
+				<view class="left">
+					名片分类
+				</view>
+				<view class="right" @click="show = true">
+					{{cardInfo.classify?cardInfo.classify:'默认分类'}}
+				</view>
+			</view>
+			<view class="" style="padding: 20rpx 0;">
+				<view class="left" style="margin-bottom: 20rpx;">
+					备注（选填）
+				</view>
+				<view class="right">
+					<u--textarea v-model="cardInfo.remark" placeholder="输入备注，不超过150个字 "></u--textarea>
+				</view>
+			</view>
+			<view class="flex flex-between" style="border-bottom: 1px solid #E6E5E5;padding: 20rpx 0;">
+				<view class="left">
+					我的名片
+				</view>
+				<view class="right" @click="show1 = true">
+					{{cardInfo.cardBusiness?cardInfo.cardBusiness:'无名片'}}
+				</view>
+			</view>
 		</view>
-		<u--form
-			labelPosition="left"
-			:model="cardInfo"
-			:rules="rules"
-			ref="uForm">
-			<u-form-item
-				label="名片分类"
-				prop="userInfo.name"
-				borderBottom
-				ref="item1">
-				<u-button @click="show = true">{{cardInfo.classify?cardInfo.classify:'默认分类'}}</u-button>
-			</u-form-item>
-			<u-form-item
-				label="备注（选填）"
-				prop="userInfo.name"
-				borderBottom
-				ref="item1">
-				<u--textarea v-model="cardInfo.remark" placeholder="输入备注，不超过150个字 " ></u--textarea>
-			</u-form-item>
-			<u-form-item
-				label="我的名片"
-				prop="userInfo.name"
-				borderBottom
-				ref="item1">
-				<u-button @click="show1 = true">{{cardInfo.cardBusiness?cardInfo.cardBusiness:'无名片'}}</u-button>
-			</u-form-item>
-		</u--form>
-		<u-picker keyName="cardBusiness" title="选择名片" @close="show1=false"
-			@cancel="show1=false" closeOnClickOverlay @confirm="cardConfirm" :show="show1" :columns="cardList"></u-picker>
-		<u-picker keyName="circleName" title="选择分类" @close="show=false"
-			@cancel="show=false" closeOnClickOverlay @confirm="typeConfirm" :show="show" :columns="columns"></u-picker>
-		<u-button @click='cancel' text="取消"></u-button>
-		<u-button @click='$u.debounce(save, 500)' text="保存"></u-button>
+		<u-picker keyName="cardBusiness" title="选择名片" @close="show1=false" @cancel="show1=false" closeOnClickOverlay
+			@confirm="cardConfirm" :show="show1" :columns="cardList"></u-picker>
+		<u-picker keyName="circleName" title="选择分类" @close="show=false" @cancel="show=false" closeOnClickOverlay
+			@confirm="typeConfirm" :show="show" :columns="columns"></u-picker>
+			<view class="bottom-btn">
+				<u-button @click='cancel' text="取消" type="primary" :plain="true" color="#18254C" :customStyle="btnStyle"></u-button>
+				<u-button @click='$u.debounce(save, 500)' text="保存" type="primary" color="#18254C" :customStyle="btnStyle"></u-button>
+			</view>
+		
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
 <script>
+	import Card from '../../components/Card/Card.vue'
 	export default {
+		components: {
+			Card
+		},
 		data() {
 			return {
-				id:'',
-				cardInfo:{},
-				show:false,
-				show1:false,
-				columns:[],
-				cardList:[],
+				btnStyle:{
+					// width:'calc(50% - 80rpx)'
+				},
+				bottomStyle: [
+					"position:absolute;left: 0;width:24vw;height:0;border-bottom:80rpx solid red;border-right:80rpx solid transparent;border-radius:0 0 0 20rpx",
+					"position: absolute;right: -40rpx;width: 58vw;height: 0;border-top: 80rpx solid green;border-left: 80rpx solid transparent;border-radius: 0 0 10px 0"
+				],
+				id: '',
+				cardInfo: {},
+				show: false,
+				show1: false,
+				columns: [],
+				cardList: [],
 				rules: {
 					'userInfo.name': {
 						type: 'string',
@@ -87,27 +110,28 @@
 			}
 		},
 		onLoad(options) {
-				this.id=options.id
-				this.getList()
+			debugger
+			this.id = options.id.indexOf(",") ? options.id.split(",")[0] : options.id
+			this.getList()
 		},
 		onShow() {
-			
+
 		},
 		methods: {
-			save(){
+			save() {
 				uni.showLoading({
 					title: '数据加载中',
-					mask:true
+					mask: true
 				})
 				this.$request.baseRequest('admin.unimall.cardHolderInfo', 'add', {
-					cardHolderInfo:JSON.stringify({
-						cardId:this.cardInfo.id,
-						remark:this.cardInfo.remark,
-						cardCommonId:this.cardInfo.cardCommonId,
-						myCardId:this.cardInfo.myCardId,
-						commonId:uni.getStorageSync("userInfo").id,
-						classify:this.cardInfo.classify
-						})
+					cardHolderInfo: JSON.stringify({
+						cardId: this.cardInfo.id,
+						remark: this.cardInfo.remark,
+						cardCommonId: this.cardInfo.cardCommonId,
+						myCardId: this.cardInfo.myCardId,
+						commonId: uni.getStorageSync("userInfo").id,
+						classify: this.cardInfo.classify
+					})
 				}, failres => {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -120,29 +144,30 @@
 						message: '保存成功！',
 					})
 					uni.switchTab({
-						url:"/pages/cardHolder/cardHolder"
-						
+						url: "/pages/cardHolder/cardHolder"
+
 					})
 				})
 			},
-			cancel(){
+			cancel() {
 				uni.switchTab({
-					url:"/pages/cardHolder/cardHolder"
-					
+					url: "/pages/cardHolder/cardHolder"
+
 				})
 			},
-			cardConfirm(e){
+			cardConfirm(e) {
 				console.log(e)
-				this.cardInfo.cardBusiness=e.value[0].cardBusiness
-				this.cardInfo.myCardId=e.value[0].id
-				this.show1=false
+				this.cardInfo.cardBusiness = e.value[0].cardBusiness
+				this.cardInfo.myCardId = e.value[0].id
+				this.show1 = false
 			},
-			typeConfirm(e){
+			typeConfirm(e) {
 				console.log(e)
-				this.cardInfo.classify=e.value[0].circleName
-				this.show=false
+				this.cardInfo.classify = e.value[0].circleName
+				this.show = false
 			},
-			getList(){
+			getList() {
+				debugger
 				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
 					commonId: uni.getStorageSync("userInfo").id
 				}, failres => {
@@ -154,10 +179,10 @@
 				}).then(res => {
 					this.cardList = [res.data.items]
 				})
-				this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list',{
-					page:1,
-					limit:9999,
-					commonId:uni.getStorageSync("userInfo").id
+				this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list', {
+					page: 1,
+					limit: 9999,
+					commonId: uni.getStorageSync("userInfo").id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
 					this.$refs.uToast.show({
@@ -165,29 +190,62 @@
 						message: failres.errmsg,
 					})
 				}).then(res => {
-					this.columns=[res.data.items]
+					this.columns = [res.data.items]
 					console.log(this.columns)
 				})
-				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'get',{
-						id:this.id
-					}, failres => {
-						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
-						uni.hideLoading()
-					}).then(res => {
-						this.cardInfo=res.data
-						this.cardInfo.cardCommonId=res.data.commonId
-						console.log(res)
+				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'get', {
+					id: this.id
+				}, failres => {
+					console.log('res+++++', failres.errmsg)
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
 					})
-					
-				}
+					uni.hideLoading()
+				}).then(res => {
+					this.cardInfo = res.data
+					this.cardInfo.cardCommonId = res.data.commonId
+					console.log(res)
+				})
+
+			}
 		}
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	.card-wrap {
+		position: relative;
 
-</style>
+		.row-text {
+			position: absolute;
+			bottom: 20px;
+			left: 110rpx;
+		}
+	}
+	.title{
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #19191A;
+		margin-left: 20rpx;
+	}
+	.form-style{
+		background: #fff;
+		padding: 20rpx;
+		margin: 20rpx;
+		box-sizing: border-box;
+		border-radius: 20rpx;
+		.row{
+			display: flex;
+			justify-content: space-between;
+		}
+	}
+	.bottom-btn{
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		justify-content: space-between;
+		// padding: 20rpx;
+		width: 100vw;
+	}
+</style>

xiaochengxu/pages/mySet/cardType.vue

@@ -66,23 +66,36 @@
 					})
 					uni.hideLoading()
 				}).then(res => {
-					this.cardTypeList = res.data.items
+					// this.cardTypeList = res.data.items
 					uni.hideLoading()
-					for (let i = 0; i < this.cardTypeList.length; i++) {
-						if (this.cardTypeList[i].topMarking == 0) {
-							if (i == 0) {
-								this.cardTypeList.unshift({
-									circleName: '默认分类',
-									name: '默'
-								});
-							} else {
-								this.cardTypeList.splice(i, 0, {
-									circleName: '默认分类',
-									name: '默'
-								})
-							}
-							return
+					debugger
+					if (res.data.items.length > 0) {
+						for (var i = 0; i < res.data.items.length; i++) {
+							res.data.items[i].name = res.data.items[i].circleName[0]
 						}
+						var itemIndex = res.data.items.findIndex((item) => {
+							return item.topMarking == 1
+						})
+						if (itemIndex != -1) {
+							var data = res.data.items.splice(itemIndex, 1)
+							res.data.items.unshift({
+								circleName: '默认分类',
+								name: '默'
+							})
+							res.data.items = data.concat(res.data.items)
+							
+						} else {
+							res.data.items = [{
+								circleName: '默认分类',
+								name: '默'
+							}].concat(res.data.items)
+						}
+						this.cardTypeList = res.data.items
+					} else {
+						this.cardTypeList = [{
+							circleName: '默认分类',
+							name: '默'
+						}]
 					}
 				})
 			},

xiaochengxu/pages/mySet/myHome.vue

@@ -3,7 +3,7 @@
 		<view v-if='!editstatus&&fileList.length>0' class="swiper-wrap">
 			<u-swiper :list="fileList" 
 			autoplay
-			imgMode='aspectFit'
+			imgMode='aspectFill'
 			height='260'
 		    @change="e => current = e.current" @click="click">
 				<view slot="indicator" class="indicator">
@@ -26,7 +26,7 @@
 		</view>
 		<view class="company-title row flex flex-between line" >
 			<view class='title' v-if='!editstatus'>{{companyData.companyName}}</view>
-			<view v-if='!editstatus' style='width:50px;' class='button flex align-item-center' @click='edit'>
+			<view v-if='!editstatus' class='button flex align-item-center' @click='edit'>
 				<image src="../../static/imgs/mySet/edit.png" style='width:26rpx;height:26rpx;' mode=""></image>
 				<view style='margin-left:10rpx;'>编辑</view>
 			</view>
@@ -363,7 +363,7 @@
 		border-radius: 0px 0px 20rpx 20rpx;
 	}
 	.content1{
-		margin: 20rpx 0 120rpx 0;
+		margin: 0rpx 0 120rpx 0;
 		background-color: #fff;
 		border-radius: 20rpx 20rpx 0 0;
 		padding:10rpx 20rpx;
@@ -383,7 +383,7 @@
 	}
 	.content1-edit{
 		position: relative;
-		top: -135rpx;
+		top: -230rpx;
 		margin: 20rpx 20rpx 120rpx 20rpx;
 		border-radius: 20rpx;
 		padding:20rpx;
@@ -393,16 +393,20 @@
 		bottom: 80rpx;
 		width: calc(100% - 40rpx);
 		padding: 0 20rpx;
+		z-index: 999;
 	}
 	.button{
 		color: #fff;
 		background-color: #112253;
 		border-radius: 20rpx;
-		padding:20rpx;
+		padding:10rpx;
 		font-size:28rpx;
 	}
 	.company-title{
-		margin:0 20rpx;
+		margin:30rpx 20rpx;
+		.button{
+			padding:10rpx 20rpx;
+		}
 	}
 	.company-title .title{
 		color:#112253;
@@ -413,7 +417,6 @@
 		font-size:32rpx;
 		font-weight: bold;
 		color: #1A1A1A;
-		margin-bottom:20rpx;
 	}
 	.content{
 		font-size: 28rpx;

xiaochengxu/pages/mySet/mySet.vue

@@ -480,6 +480,9 @@
 			padding: 0;
 			margin: 0;
 			font-size: 32rpx;
+			    height: 42rpx;
+			    display: flex;
+			    align-items: center;
 		}
 		.left-btn:after{
 			border: none!important;