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

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

@@ -81,7 +81,7 @@ public class CircleFriendsInfoServiceImpl implements ICircleFriendsInfoService {
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<CircleFriendsInfo> list = circleFriendsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		if (!CollectionUtils.isEmpty(list)){
 			for (CircleFriendsInfo circleFriendsInfo:list){

xiaochengxu/components/Card/Card.vue

@@ -54,7 +54,7 @@
 						<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"
+							<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px"
 								shape="circle" v-else></u--image>
 						</view>
 					</view>
@@ -62,7 +62,7 @@
 						<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"
+							<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px"
 								shape="circle" v-else></u--image>
 						</view>
 						<view class="bottom flex">
@@ -102,7 +102,7 @@
 							<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"
+								<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px"
 									shape="circle" v-else></u--image>
 							</view>
 							<view class="right">
@@ -175,7 +175,7 @@
 					<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"
+						<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle"
 							v-else></u--image>
 					</view>
 				</view>
@@ -183,7 +183,7 @@
 					<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"
+						<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle"
 							v-else></u--image>
 					</view>
 					<view class="bottom flex">

xiaochengxu/components/zhangyuhao-poster/Poster.vue

@@ -167,19 +167,17 @@ imageType：用于区分图片是本地图片还是网络图片本地图片需
 								if (current.index === i) {
 									/* 文本绘制 */
 									if (current.type === 'text') {
-										console.log('绘制文本：' + current.text);
 										fillText(current)
 										this.counter--
 									}
 									/* 多行文本 */
 									if (current.type === 'textarea') {
-										console.log('绘制段落：' + current.text);
 										fillParagraph(current)
 										this.counter--
 									}
 									/* 图片绘制 */
 									if (current.type === 'image') {
-										console.log('绘制图片：' + current.path);
+
 										if (current.area) {
 											// 绘制绘图区域
 											this.ctx.save()
@@ -233,12 +231,11 @@ imageType：用于区分图片是本地图片还是网络图片本地图片需
 				}
 			},
 			counter(newVal, oldVal) {
-				console.log(newVal)
 				if (newVal === 0) {
 					this.ctx.draw()
 					/* draw完不能立刻转存，需要等待一段时间 */
 					setTimeout(() => {
-						console.log('final counter', this.counter);
+
 						uni.canvasToTempFilePath({
 							canvasId: 'myCanvas',
 							success: (res) => {

xiaochengxu/config/index.js

@@ -1,6 +1,6 @@
 const dev = {
 	// baseUrlNew: 'http://192.168.110.72:8182',
-	// baseUrlNew: 'http://192.168.110.138:8182',
+	baseUrlNew: 'http://192.168.110.138:8182',
 	// baseUrlNew: 'http://192.168.110.82:8182',
 	baseUrlNew: 'https://cardapi.eliangeyun.com',
 	h5Appid: 'wxb66b599f7f61b46f',

xiaochengxu/pages/cardHolder/notice.vue → xiaochengxu/pageA/cardHolder/notice.vue

@@ -40,7 +40,6 @@
 				this.$request.baseRequest('admin.unimall.cardNewsInfo', 'list',{
 					receiveId:uni.getStorageSync("userInfo").id,
 				}, failres => {
-					console.log('res+++++', failres.errmsg)
 					uni.showToast({
 						icon:"none",
 						title: failres.errmsg,
@@ -48,7 +47,6 @@
 					});
 					uni.hideLoading()
 				}).then(res => {
-					console.log(res)
 					let curPageLen = res.data.items.length;
 					let totalPage = res.data.total;
 					this.noticeList=res.data.items
@@ -62,7 +60,6 @@
 									this.$request.baseRequest('admin.unimall.cardNewsInfo', 'update',{
 										cardNewsInfo:JSON.stringify(this.unreadList[i]),
 									}, failres => {
-										console.log('res+++++', failres.errmsg)
 										uni.showToast({
 											icon:"none",
 											title: failres.errmsg,

xiaochengxu/pages/cardHolder/scancode.vue → xiaochengxu/pageA/cardHolder/scancode.vue

@@ -137,7 +137,6 @@ export default {
 		    );
 		},
 		takePhoto() {
-			console.log(1111111)
 			uni.showLoading({
 				title: '数据加载中',
 				mask:true
@@ -147,12 +146,10 @@ export default {
 	        ctx.takePhoto({
 	            quality: 'high',
 				fail: (req) => {
-					console.log(req,22222)
 					uni.hideLoading()
 	            },
 	            success: (res) => {
 	                this.src = res.tempImagePath
-					console.log(res.tempImagePath,33333333)
 					this.uploadFilePromise(res.tempImagePath)
 	            },
 				
@@ -172,7 +169,7 @@ export default {
 		},
        // 显示扫码界面(扫一扫)
        scanShowClick(){
-		   console.log('扫码',111111)
+		   console.log('扫码')
            // 校验权限, 必须开启摄像头权限
            // wx.getSetting({
            //     success:async(res)=> {
@@ -207,11 +204,11 @@ export default {
 		   }else{
 			   this.flag=true
 			   if(e){
-				   console.log(e,1111111)
+				   console.log(e)
 				   if(e.target.result){
 					   
 						uni.navigateTo({
-							url: "/pages/cardHolder/scanCodeAddCard?id="+e.target.result
+							url: "/pageA/cardHolder/scanCodeAddCard?id="+e.target.result
 						})
 						this.flag=false
 				   }else{

xiaochengxu/pages/circle/circle-item.vue → xiaochengxu/pageA/circle/circle-item.vue

@@ -182,7 +182,7 @@ watch:{
 
 		toDetail(item) {
 			uni.navigateTo({
-				url: '/pages/circle/circleDetail?item=' + JSON.stringify(item)
+				url: '/pageA/circle/circleDetail?item=' + JSON.stringify(item)
 			});
 		},
 

xiaochengxu/pages/circle/detail.vue → xiaochengxu/pageA/circle/detail.vue

@@ -305,7 +305,7 @@
 		methods: {
 			toFriendsCirlce(){
 				uni.navigateTo({
-					url:"/pages/circle/friendSCirlce?id="+this.dataObj.id
+					url:"/pageA/circle/friendSCirlce?id="+this.dataObj.id
 				})
 			},
 			changeMoreConfirm(val){
@@ -361,7 +361,7 @@
 			},
 			toHome(item){
 				uni.navigateTo({
-					url:'/pages/circle/lookHome?id='+item.personalHomeId
+					url:'/pageA/circle/lookHome?id='+item.personalHomeId
 				})
 			},
 			confirmChangeSubmit() {

xiaochengxu/pages/circle/friendSCirlce.vue → xiaochengxu/pageA/circle/friendSCirlce.vue

@@ -86,8 +86,9 @@
 		},
 		methods: {
 			addCircle() {
+				console.log(1111)
 				uni.navigateTo({
-					url: "/pages/circle/addFriendCirlce?id=" + this.circleId
+					url: "/pageA/circle/addFriendCirlce?id=" + this.circleId
 				})
 			},
 			/*下拉刷新的回调 */

xiaochengxu/pages/mySet/editCard.vue → xiaochengxu/pageA/mySet/editCard.vue

@@ -299,19 +299,19 @@
 			return {
 				layoutSelectIndex: 0,
 				layoutImgList: [{
-						dictValue: '/static/imgs/card/1.png',
+						dictValue: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/muban3.png',
 						dictSort: 1
 					},
 					{
-						dictValue: '/static/imgs/card/2.png',
+						dictValue: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/muban2.png',
 						dictSort: 2
 					},
+					// {
+					// 	dictValue: '/static/imgs/card/3.png',
+					// 	dictSort: 3
+					// },
 					{
-						dictValue: '/static/imgs/card/3.png',
-						dictSort: 3
-					},
-					{
-						dictValue: '/static/imgs/card/4.png',
+						dictValue: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/muban1.png',
 						dictSort: 4
 					}
 				],

xiaochengxu/pages/mySet/myInfo.vue → xiaochengxu/pageA/mySet/myInfo.vue

@@ -648,7 +648,7 @@
 			},
 			toHome(item) {
 				uni.navigateTo({
-					url: "/pages/mySet/myHome?id=" + item.personalHomeId
+					url: "/pageA/mySet/myHome?id=" + item.personalHomeId
 				})
 			},
 			radioChange(n) {
@@ -674,7 +674,7 @@
 			},
 			toEditCard(val) {
 				uni.navigateTo({
-					url: "/pages/mySet/editCard?itemVal=" + JSON.stringify(val)
+					url: "/pageA/mySet/editCard?itemVal=" + JSON.stringify(val)
 				})
 			},
 			delCard() {
@@ -713,7 +713,7 @@
 			},
 			addCard() {
 				uni.navigateTo({
-					url: "/pages/mySet/newCard?cardIndex=" + (this.cardList.length + 1)
+					url: "/pageA/mySet/newCard?cardIndex=" + (this.cardList.length + 1)
 				})
 			},
 			topMarking(val) {

xiaochengxu/pages/mySet/newCard.vue → xiaochengxu/pageA/mySet/newCard.vue

@@ -294,19 +294,19 @@
 			return {
 				layoutSelectIndex: 0,
 				layoutImgList: [{
-						dictValue: '/static/imgs/card/1.png',
+						dictValue: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/muban3.png',
 						dictSort: 1
 					},
 					{
-						dictValue: '/static/imgs/card/2.png',
+						dictValue: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/muban2.png',
 						dictSort: 2
 					},
+					// {
+					// 	dictValue: '/static/imgs/card/3.png',
+					// 	dictSort: 3
+					// },
 					{
-						dictValue: '/static/imgs/card/3.png',
-						dictSort: 3
-					},
-					{
-						dictValue: '/static/imgs/card/4.png',
+						dictValue: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/muban1.png',
 						dictSort: 4
 					}
 				],
@@ -486,7 +486,7 @@
 							uni.navigateBack()
 						} else {
 							uni.navigateTo({
-								url: '/pages/mySet/myHome'
+								url: '/pageA/mySet/myHome'
 							})
 						}
 					})

xiaochengxu/pages/mySet/poster.vue → xiaochengxu/pageA/mySet/poster.vue

@@ -119,7 +119,6 @@
 				cardList: [],
 				list:[],
 				theight:0,
-				canvas1:'',
 				poster:'',
 				type:'2d',
 				height:0,
@@ -496,82 +495,82 @@
 								data[i].use === 'address-icon' ||
 								data[i].use === 'phone-icon' ||
 								data[i].use === 'remark-icon') {
-								data[i].x = 30
+								data[i].x = 60
 							}
 							if (data[i].use === 'post') {
-								data[i].x = 100
+								data[i].x = 200
 							}
 							if (data[i].use === 'address' ||
 								data[i].use === 'phone' ||
 								data[i].use === 'remark') {
-								data[i].x = 60
+								data[i].x = 120
 							}
 							if (data[i].use == 'head') {
-								data[i].x = 370
+								data[i].x = 740
 							}
 							break;
 						case '3':
 							if (data[i].use === 'name') {
-								data[i].x = 30
-								data[i].y = 150
+								data[i].x = 60
+								data[i].y = 300
 							}
 							if (data[i].use === 'companyName') {
-								data[i].x = 30
-								data[i].y = 180
+								data[i].x = 60
+								data[i].y = 360
 							}
 							if (data[i].use === 'post') {
-								data[i].x = 100
-								data[i].y = 153
+								data[i].x = 200
+								data[i].y = 306
 							}
 							if (data[i].use === 'address-icon' ||
 								data[i].use === 'phone-icon' ||
 								data[i].use === 'remark-icon') {
-								data[i].x = 170
+								data[i].x = 340
 							}
 							if (data[i].use === 'address-icon') {
-								data[i].y = 150
+								data[i].y = 300
 							}
 							if (data[i].use === 'address') {
-								data[i].y = 155;
+								data[i].y = 310;
 								data[i].width = 300
 							}
 							if (data[i].use === 'phone-icon') {
-								data[i].y = 180
+								data[i].y = 360
 							}
 							if (data[i].use === 'phone') {
-								data[i].y = 183
+								data[i].y = 366
 							}
 							if (data[i].use === 'remark-icon') {
-								data[i].y = 210
+								data[i].y = 420
 							}
 							if (data[i].use === 'remark') {
-								data[i].y = 212
+								data[i].y = 424
 							}
 							if (data[i].use === 'address' ||
 								data[i].use === 'phone' ||
 								data[i].use === 'remark') {
-								data[i].x = 190
+								data[i].x = 380
 							}
 							break;
 						case '4':
 							if (data[i].use === 'name' ||
 								data[i].use === 'companyName') {
-								data[i].x = 30
+								data[i].x = 60
 							}
 							if (data[i].use === 'companyName') {
-								data[i].y = 90
+								data[i].y = 180
 							}
 							if (data[i].use === 'post') {
-								data[i].x = 100
+								data[i].x = 200
 							}
 							if (data[i].use == 'head') {
-								data[i].x = 25
-								data[i].y = 120
+								data[i].x = 45
+								data[i].y = 240
 							}
 							if (data[i].use === 'address-icon' ||
 								data[i].use === 'phone-icon' ||
 								data[i].use === 'remark-icon') {
-								data[i].x = 170
+								data[i].x = 340
 							}
 							if (data[i].use === 'address') {
 								data[i].width = 300
@@ -579,7 +578,7 @@
 							if (data[i].use === 'address' ||
 								data[i].use === 'phone' ||
 								data[i].use === 'remark') {
-								data[i].x = 190
+								data[i].x = 380
 							}
 							break;
 						default:

xiaochengxu/pages.json

@@ -24,13 +24,6 @@
 		
 			}
 		
-		},{
-			"path": "pages/mySet/myInfo",
-			"style": {
-				"navigationBarTitleText": "我的名片",
-				"enablePullDownRefresh": false
-			}
-
 		},
 		{
 			"path": "pages/circle/circle",
@@ -47,57 +40,97 @@
 				"enablePullDownRefresh": false
 			}
 
-		},  {
-			"path": "pages/cardHolder/map",
+		}
+    ],
+	"tabBar": {
+		"custom": false,
+		"color": "#656765",
+		"selectedColor": "#112253",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/cardHolder/cardHolder",
+				"iconPath": "static/imgs/wjj.png",
+				"selectedIconPath": "static/imgs/swjj.png",
+				"text": "电子名片"
+			},
+			{
+				"pagePath": "pages/circle/circle",
+				"iconPath": "static/imgs/cirlcle.png",
+				"selectedIconPath": "static/imgs/scirlce.png",
+				"text": "圈子"
+			},
+			{
+				"pagePath": "pages/mySet/mySet",
+				"iconPath": "static/imgs/my.png",
+				"selectedIconPath": "static/imgs/smy.png",
+				"text": "我的"
+			}
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "电子名片",
+		"navigationBarBackgroundColor": "#112253",
+		"backgroundColor": "#F8F8F8",
+		"app-plus": {
+			"background": "#efeff4"
+		}
+	},
+	"subPackages": [
+		{
+			"root":"pageA",
+			"pages": [{
+			"path": "cardHolder/map",
 			"style": {
 				"navigationBarTitleText": "地图",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/cardHolder/notice",
+			"path": "cardHolder/notice",
 			"style": {
 				"navigationBarTitleText": "消息",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/cardHolder/search",
+			"path": "cardHolder/search",
 			"style": {
 				"navigationBarTitleText": "名片",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/circle/detail",
+			"path": "circle/detail",
 			"style": {
 				"navigationBarTitleText": "圈子详情",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/circle/changeCard",
+			"path": "circle/changeCard",
 			"style": {
 				"navigationBarTitleText": "名片交换",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/circle/search",
+			"path": "circle/search",
 			"style": {
 				"navigationBarTitleText": "圈子",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/circle/createCirclce",
+			"path": "circle/createCirclce",
 			"style": {
 				"navigationBarTitleText": "创建圈子",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/mySet/myCard",
+			"path": "mySet/myCard",
 			"style": {
 				"navigationBarTitleText": "我的证件",
 				"enablePullDownRefresh": false,
@@ -105,7 +138,7 @@
 			}
 
 		}, {
-			"path": "pages/mySet/myHome",
+			"path": "mySet/myHome",
 			"style": {
 				"navigationBarTitleText": "主页信息",
 				"enablePullDownRefresh": false,
@@ -113,28 +146,28 @@
 			}
 
 		}, {
-			"path": "pages/mySet/cardType",
+			"path": "mySet/cardType",
 			"style": {
 				"navigationBarTitleText": "名片分类",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/mySet/contactCustomer",
+			"path": "mySet/contactCustomer",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/mySet/set",
+			"path": "mySet/set",
 			"style": {
 				"navigationBarTitleText": "设置",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/mySet/myAccount",
+			"path": "mySet/myAccount",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
@@ -142,7 +175,7 @@
 
 		},
 		{
-			"path": "pages/mySet/help",
+			"path": "mySet/help",
 			"style": {
 				"navigationBarTitleText": "帮助说明",
 				"enablePullDownRefresh": false
@@ -151,49 +184,49 @@
 		}
 
 		, {
-			"path": "pages/mySet/newCard",
+			"path": "mySet/newCard",
 			"style": {
 				"navigationBarTitleText": "新增名片",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/mySet/editHome",
+			"path": "mySet/editHome",
 			"style": {
 				"navigationBarTitleText": "主页信息",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/mySet/editCard",
+			"path": "mySet/editCard",
 			"style": {
 				"navigationBarTitleText": "编辑名片",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/mySet/lookCard",
+			"path": "mySet/lookCard",
 			"style": {
 				"navigationBarTitleText": "证件分享",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/cardHolder/scancode",
+			"path": "cardHolder/scancode",
 			"style": {
 				"navigationBarTitleText": "扫码添加",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/cardHolder/scanCodeAddCard",
+			"path": "cardHolder/scanCodeAddCard",
 			"style": {
 				"navigationBarTitleText": "添加名片",
 				"enablePullDownRefresh": false
 			}
 		}
 	    ,{
-            "path" : "pages/circle/lookHome",
+            "path" : "circle/lookHome",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "主页",
@@ -202,7 +235,7 @@
             
         }
         ,{
-            "path" : "pages/mySet/editNickName",
+            "path" : "mySet/editNickName",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "修改昵称",
@@ -212,14 +245,14 @@
         }
         ,{
 
-            "path" : "pages/mySet/poster",
+            "path" : "mySet/poster",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "生成海报"
 			}
 		},
 		{
-            "path" : "pages/circle/friendSCirlce",
+            "path" : "circle/friendSCirlce",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "动态",
@@ -228,48 +261,28 @@
             
         }
         ,{
-            "path" : "pages/circle/addFriendCirlce",
+            "path" : "circle/addFriendCirlce",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "添加动态",
                 "enablePullDownRefresh": false
             }
             
-        }
-    ],
-	"tabBar": {
-		"custom": false,
-		"color": "#656765",
-		"selectedColor": "#112253",
-		"borderStyle": "white",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/cardHolder/cardHolder",
-				"iconPath": "static/imgs/wjj.png",
-				"selectedIconPath": "static/imgs/swjj.png",
-				"text": "电子名片"
-			},
-			{
-				"pagePath": "pages/circle/circle",
-				"iconPath": "static/imgs/cirlcle.png",
-				"selectedIconPath": "static/imgs/scirlce.png",
-				"text": "圈子"
-			},
-			{
-				"pagePath": "pages/mySet/mySet",
-				"iconPath": "static/imgs/my.png",
-				"selectedIconPath": "static/imgs/smy.png",
-				"text": "我的"
+        },{
+			"path": "mySet/myInfo",
+			"style": {
+				"navigationBarTitleText": "我的名片",
+				"enablePullDownRefresh": false
 			}
-		]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "电子名片",
-		"navigationBarBackgroundColor": "#112253",
-		"backgroundColor": "#F8F8F8",
-		"app-plus": {
-			"background": "#efeff4"
+
 		}
+			]
+		}
+	],
+	"preloadRule": {
+			"pages/cardHolder/cardHolder": {
+				"network": "all",
+				"packages": ["pageA"]
+			}
 	}
 }

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -588,7 +588,7 @@
 			},
 			toHome(item) {
 				uni.navigateTo({
-					url: "/pages/circle/lookHome?id=" + item.personalHomeId
+					url: "/pageA/circle/lookHome?id=" + item.personalHomeId
 				})
 			},
 			delSearchVal() {
@@ -932,14 +932,13 @@
 			},
 
 			longpress() {
-				console.log("长按事件", 1111111111);
+				console.log("长按事件");
 				this.islongPress = true;
 
 			},
 			checkboxChange(e, i) {
-				console.log(e, i, 111111111)
+				console.log(e, i)
 				if (i === '') {
-					console.log(this.checked)
 					this.checked = !this.checked;
 					this.cardHolderList.map(item => item.checked = this.checked);
 					this.$forceUpdate()
@@ -977,7 +976,6 @@
 					this.$request.baseRequest('admin.unimall.cardHolderInfo', 'update', {
 						cardHolderInfo: JSON.stringify(this.currectData),
 					}, failres => {
-						console.log('res+++++', failres.errmsg)
 						uni.showToast({
 							icon: "none",
 							title: failres.errmsg,
@@ -1008,12 +1006,11 @@
 			},
 			typeConfirm(e) {
 				if (this.type == 2) {
-					console.log(e.value[0].circleName, "123312132")
+					console.log(e.value[0].circleName)
 					this.$set(this.currectData, 'classify', e.value[0].circleName)
 					this.$request.baseRequest('admin.unimall.cardHolderInfo', 'update', {
 						cardHolderInfo: JSON.stringify(this.currectData),
 					}, failres => {
-						console.log('res+++++', failres.errmsg)
 						uni.showToast({
 							icon: "none",
 							title: failres.errmsg,
@@ -1054,7 +1051,6 @@
 							searchContent: this.searchVal,
 							classify: this.typeName
 						}, failres => {
-							console.log('res+++++', failres.errmsg)
 							uni.showToast({
 								icon: "none",
 								title: failres.errmsg,
@@ -1062,7 +1058,6 @@
 							});
 							uni.hideLoading()
 						}).then(res => {
-							console.log(res)
 							if (page.num == 1) this.cardHolderList = [];
 							let curPageLen = res.data.items.length;
 							let totalPage = res.data.total;
@@ -1086,7 +1081,6 @@
 							limit: 9999,
 							commonId: uni.getStorageSync("userInfo").id
 						}, failres => {
-							console.log('res+++++', failres.errmsg)
 							uni.showToast({
 								icon: "none",
 								title: failres.errmsg,
@@ -1097,8 +1091,6 @@
 								circleName: '全部分类'
 							})
 							this.typeColumns = [res.data.items]
-
-							console.log(this.typeColumns)
 						})
 						//清楚扫码添加跳页刷新数据状态开关
 						uni.setStorageSync("scanAddCardToIndex", 0)
@@ -1109,7 +1101,7 @@
 			toNotice() {
 				if (this.userInfo.phone) {
 					uni.navigateTo({
-						url: "/pages/cardHolder/notice"
+						url: "/pageA/cardHolder/notice"
 					})
 				} else {
 					this.showAuthorizePhone = true
@@ -1118,7 +1110,7 @@
 			micOpen: function() {
 				if (this.userInfo.phone) {
 					uni.navigateTo({
-						url: "/pages/cardHolder/search?mic=1"
+						url: "/pageA/cardHolder/search?mic=1"
 					})
 				} else {
 					this.showAuthorizePhone = true
@@ -1144,39 +1136,12 @@
 			search() {
 				if (this.userInfo.phone) {
 					uni.navigateTo({
-						url: "/pages/cardHolder/search"
+						url: "/pageA/cardHolder/search"
 					})
 				} else {
 					this.showAuthorizePhone = true
 				}
 			},
-			input(res) {
-				console.log('----input:', res)
-			},
-			clear(res) {
-				uni.showToast({
-					title: 'clear事件，清除值为：' + res.value,
-					icon: 'none'
-				})
-			},
-			blur(res) {
-				uni.showToast({
-					title: 'blur事件，输入值为：' + res.value,
-					icon: 'none'
-				})
-			},
-			focus(e) {
-				uni.showToast({
-					title: 'focus事件，输出值为：' + e.value,
-					icon: 'none'
-				})
-			},
-			cancel(res) {
-				uni.showToast({
-					title: '点击取消，输入值为：' + res.value,
-					icon: 'none'
-				})
-			},
 			selectType() {
 				this.isShowType = true
 				this.type = 1
@@ -1194,7 +1159,6 @@
 								commonId: uni.getStorageSync("userInfo").id,
 								cardId: cardId
 							}, failres => {
-								console.log('res+++++', failres.errmsg)
 								uni.showToast({
 									icon: "none",
 									title: failres.errmsg,
@@ -1202,7 +1166,7 @@
 								});
 							}).then(res1 => {
 								uni.navigateTo({
-									url: "/pages/cardHolder/scanCodeAddCard?id=" + res.result
+									url: "/pageA/cardHolder/scanCodeAddCard?id=" + res.result
 										.split("=")[1]
 								})
 							})
@@ -1215,7 +1179,7 @@
 			},
 			toMap(item) {
 				uni.navigateTo({
-					url: "/pages/cardHolder/map?val=" + JSON.stringify(item)
+					url: "/pageA/cardHolder/map?val=" + JSON.stringify(item)
 				})
 			},
 		}

xiaochengxu/pages/circle/circle.vue

@@ -315,7 +315,7 @@
 			toChangeCard() {
 				if (this.userInfo.phone) {
 					uni.navigateTo({
-						url: "/pages/circle/changeCard"
+						url: "/pageA/circle/changeCard"
 					})
 				} else {
 					this.showAuthorizePhone = true
@@ -325,7 +325,7 @@
 			toCreateCircle() {
 				if (this.userInfo.phone) {
 					uni.navigateTo({
-						url: "/pages/circle/createCirclce"
+						url: "/pageA/circle/createCirclce"
 					})
 				} else {
 					this.showAuthorizePhone = true
@@ -337,7 +337,7 @@
 			search() {
 				if (this.userInfo.phone) {
 					uni.navigateTo({
-						url: "/pages/circle/search"
+						url: "/pageA/circle/search"
 					})
 				} else {
 					this.showAuthorizePhone = true
@@ -346,7 +346,7 @@
 			},
 			toDetail(val) {
 				uni.navigateTo({
-					url: "/pages/circle/detail?val=" + val
+					url: "/pageA/circle/detail?val=" + val
 				})
 			},
 			upCallback(page) {

xiaochengxu/pages/mySet/mySet.vue

@@ -205,13 +205,11 @@
 		},
 		onShareAppMessage(res) {
 			this.popupshow = false
-			console.log(res, this.popupshow)
 			let that = this;
 			//生成名片图片
 			let imageUrl = this.poster
-			console.log("imageUrl", imageUrl)
 			if (res.from === 'button') {
-				let path = `/pages/cardHolder/scanCodeAddCard?id=${that.currectData.id}`
+				let path = `/pageA/cardHolder/scanCodeAddCard?id=${that.currectData.id}`
 				return {
 					title: `${that.currectData.name}分享的名片~`,
 					path: path,
@@ -279,7 +277,7 @@
 			},
 			editNickName() {
 				if (this.userInfo.phone) {
-					let _url = '/pages/mySet/editNickName'
+					let _url = '/pageA/mySet/editNickName'
 					uni.navigateTo({
 						url: _url
 					})
@@ -349,7 +347,6 @@
 			},
 			selectCard1() {
 				if (this.userInfo.phone) {
-					console.log(this.cardList[0])
 					if (this.cardList[0].length > 1) {
 						this.show1 = true
 					} else if (this.cardList[0].length > 0) {
@@ -368,14 +365,12 @@
 				}
 			},
 			cardConfirm(e) {
-				console.log(e)
 				this.currectData = e.value[0]
 				this.selectCode = e.value[0].qrCodeMyself
 				this.show1 = false
 				this.isShowCode = true
 			},
 			cardChange(e) {
-				console.log(e)
 				this.currectData = e.value[0]
 				uni.showLoading({
 					title: '加载中',
@@ -537,7 +532,6 @@
 						height: 28
 					},
 				]
-				console.log(this.currectData.cuttentTemplate, 111111)
 				for (var i = 0; i < data.length; i++) {
 					switch (this.currectData.cuttentTemplate) {
 						case '2':
@@ -583,7 +577,7 @@
 							}
 							if (data[i].use === 'address') {
 								data[i].y = 155;
-								data[i].width = 300
+								data[i].width = 600
 							}
 							if (data[i].use === 'phone-icon') {
 								data[i].y = 180
@@ -624,7 +618,7 @@
 								data[i].x = 170
 							}
 							if (data[i].use === 'address') {
-								data[i].width = 300
+								data[i].width = 600
 							}
 							if (data[i].use === 'address' ||
 								data[i].use === 'phone' ||
@@ -645,7 +639,6 @@
 				uni.hideLoading()
 			},
 			posterSuccess(url) {
-				console.log("hahahah", url)
 				// 生成成功，会把临时路径在这里返回
 				this.poster = url;
 				console.log(url)
@@ -658,7 +651,7 @@
 			menuClick(typeName) {
 				if (this.userInfo.phone) {
 					if (typeName == "contactCustomer") return
-					let _url = '/pages/mySet/' + typeName
+					let _url = '/pageA/mySet/' + typeName
 					uni.navigateTo({
 						url: _url
 					})

xiaochengxu/uni_modules/cl-upload/components/cl-upload/cl-upload.vue

@@ -60,7 +60,6 @@
 					<image class="image" :src="deleteImg" mode="widthFix"></image>
 				</view>
 			</view>
-
 			<view v-if="add && FileList.length < max" @tap="onClickAdd" :style="[rowStyle]"
 				class="file-list-row add-image">
 				<image :src="addImg" mode="widthFix"></image>

xiaochengxu/util/request.js

@@ -112,7 +112,7 @@ const wxlogin = () => {
 					});
 					uni.hideLoading()
 				}).then(res => {
-					console.log(res.data)
+
 					resolve(res.data)
 				})
 			},
@@ -227,7 +227,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 						},
 						{
 							type: 'text',
-							text: '长按或扫描识别二维码',
+							text: '扫描识别二维码',
 							use:'title2',
 							css: {
 								fontSize: '24rpx',
@@ -254,7 +254,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 							src: posterObj1.qrcode,
 							use:'qrcode',
 							css: {
-								left: '455rpx',
+								left: '410rpx',
 								top: 520+dth+'rpx',
 								// transform: 'translate(-50%,0)',
 								width: '240rpx',
@@ -334,7 +334,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 					},
 					{
 						type: 'text',
-						text: '长按或扫描识别二维码',
+						text: '扫描识别二维码',
 						use:'title2',
 						css: {
 							fontSize: '24rpx',
@@ -369,7 +369,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 						type: 'view',
 						use:'qrcode-view',
 						css: {
-							left: '445rpx',
+							left: '400rpx',
 							top: 520+dth+'rpx',
 							width: '240rpx',
 							height: '240rpx',
@@ -381,7 +381,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 						src: posterObj1.qrcode,
 						use:'qrcode',
 						css: {
-							left: '455rpx',
+							left: '410rpx',
 							top: 530+dth+'rpx',
 							// transform: 'translate(-50%,0)',
 							width: '220rpx',
@@ -448,7 +448,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 							},
 							{
 								type: 'text',
-								text: '长按或扫描识别二维码',
+								text: '扫描识别二维码',
 								use:'title2',
 								css: {
 									fontSize: '24rpx',
@@ -463,7 +463,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 								type: 'view',
 								use:'qrcode-view',
 								css: {
-									left: '405rpx',
+									left: '365rpx',
 									top: 500+dth+'rpx',
 									width: '240rpx',
 									height: '240rpx',
@@ -475,7 +475,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 								src: posterObj1.qrcode,
 								use:'qrcode',
 								css: {
-									left: '415rpx',
+									left: '375rpx',
 									top: 510+dth+'rpx',
 									// transform: 'translate(-50%,0)',
 									width: '220rpx',
@@ -541,7 +541,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 					},
 					{
 						type: 'text',
-						text: '长按或扫描识别二维码',
+						text: '扫描识别二维码',
 						use:'title2',
 						css: {
 							fontSize: '24rpx',
@@ -556,7 +556,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 						type: 'view',
 						use:'qrcode-view',
 						css: {
-							left: '440rpx',
+							left: '400rpx',
 							top: 500+dth+'rpx',
 							width: '240rpx',
 							height: '240rpx',
@@ -568,7 +568,7 @@ const makeCanvasData = (check_idx,height,posterObj1,theight) => {
 						src: posterObj1.qrcode,
 						use:'qrcode',
 						css: {
-							left: '450rpx',
+							left: '410rpx',
 							top: 510+dth+'rpx',
 							// transform: 'translate(-50%,0)',
 							width: '220rpx',