高敬炎 %!s(int64=2) %!d(string=hai) anos
pai
achega
0784ddcfc7

+ 1 - 0
xiaochengxu/components/zhangyuhao-poster/Poster.vue

@@ -138,6 +138,7 @@ list参数说明:
 				/* 所有元素入队则开始绘制 */
 				/* 所有元素入队则开始绘制 */
 				if (newVal.length === this.list.length) {
 				if (newVal.length === this.list.length) {
 					try {
 					try {
+						console.log(this.list,1111111)
 						// console.log('生成的队列:' + JSON.stringify(newVal));
 						// console.log('生成的队列:' + JSON.stringify(newVal));
 						console.log('开始绘制...')
 						console.log('开始绘制...')
 						for (let i = 0; i < this.drawPathQueue.length; i++) {
 						for (let i = 0; i < this.drawPathQueue.length; i++) {

+ 8 - 6
xiaochengxu/pages.json

@@ -2,22 +2,24 @@
 	"easycom": {
 	"easycom": {
 		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
 		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
 	},
 	},
-	"pages": [{
-			"path": "pages/mySet/myInfo",
+	"pages": [
+		{
+			"path": "pages/circle/circle",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "我的名片",
+				"navigationBarTitleText": "圈子",
 				"enablePullDownRefresh": false
 				"enablePullDownRefresh": false
 			}
 			}
-
+		
 		},
 		},
 		{
 		{
-			"path": "pages/circle/circle",
+			"path": "pages/mySet/myInfo",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "圈子",
+				"navigationBarTitleText": "我的名片",
 				"enablePullDownRefresh": false
 				"enablePullDownRefresh": false
 			}
 			}
 
 
 		},
 		},
+		
 		{
 		{
 			"path": "pages/mySet/mySet",
 			"path": "pages/mySet/mySet",
 			"style": {
 			"style": {

+ 2 - 1
xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -132,7 +132,7 @@
 		</u-popup>
 		</u-popup>
 		<!-- <image :src="poster" style="width: 750rpx;height: 1334rpx;"></image> -->
 		<!-- <image :src="poster" style="width: 750rpx;height: 1334rpx;"></image> -->
 		<!-- 生成图片 -->
 		<!-- 生成图片 -->
-		<poster v-if="list.length" :list="list" background-color="#FFF"
+		<poster v-if="list&&list.length>0" :list="list" background-color="#FFF"
 			@on-success="posterSuccess" ref="poster" @on-error="posterError"></poster>
 			@on-success="posterSuccess" ref="poster" @on-error="posterError"></poster>
 	</view>
 	</view>
 </template>
 </template>
@@ -167,6 +167,7 @@
 				qrcodeShow: false,
 				qrcodeShow: false,
 				unread: 0,
 				unread: 0,
 				noticeList: [],
 				noticeList: [],
+				list:[]
 			};
 			};
 		},
 		},
 		onShow() {
 		onShow() {

+ 42 - 7
xiaochengxu/pages/mySet/myHome.vue

@@ -1,12 +1,20 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
 		<view v-if='!editstatus&&fileList.length>0' class="swiper-wrap">
 		<view v-if='!editstatus&&fileList.length>0' class="swiper-wrap">
-			<u-swiper :list="fileList" indicator indicatorMode="dot"
+			<u-swiper :list="fileList" 
 			autoplay
 			autoplay
 			imgMode='aspectFit'
 			imgMode='aspectFit'
-			height='300'
-		    @change="change" @click="click">
-			</u-swiper>	
+			height='280'
+		    @change="e => current = e.current" @click="click">
+				<view slot="indicator" class="indicator">
+					<view
+			            class="indicator__dot"
+			            v-for="(item, index) in fileList"
+			            :key="index"
+			            :class="[index === current && 'indicator__dot--active']">
+			        </view>
+				</view>
+			</u-swiper>
 		</view>
 		</view>
 		<!-- <u-skeleton
 		<!-- <u-skeleton
 			    rows="3"
 			    rows="3"
@@ -21,9 +29,9 @@
 				<view v-if='editstatus'>公司/机构名称</view>
 				<view v-if='editstatus'>公司/机构名称</view>
 				<view class='title' v-else>{{companyData.companyName}}</view>
 				<view class='title' v-else>{{companyData.companyName}}</view>
 			 	<u--input v-if='editstatus' v-model="companyData.companyName"  placeholder="请输入公司名称" border="none" inputAlign='right'></u--input>
 			 	<u--input v-if='editstatus' v-model="companyData.companyName"  placeholder="请输入公司名称" border="none" inputAlign='right'></u--input>
-				<view v-if='!editstatus' style='width:30px;' class='button flex align-item-center' @click='edit'>
+				<view v-if='!editstatus' style='width:50px;' class='button flex align-item-center' @click='edit'>
 					<image src="../../static/imgs/mySet/edit.png" style='width:26rpx;height:26rpx;' mode=""></image>
 					<image src="../../static/imgs/mySet/edit.png" style='width:26rpx;height:26rpx;' mode=""></image>
-					<view >编辑</view>
+					<view style='margin-left:10rpx;'>编辑</view>
 				</view>
 				</view>
 				<view v-else @click='$u.debounce(buttonsubmit, 500)' class='button'>提交</view>
 				<view v-else @click='$u.debounce(buttonsubmit, 500)' class='button'>提交</view>
 			</view>
 			</view>
@@ -91,7 +99,8 @@
 				fileList:[],
 				fileList:[],
 				fileList1:[],
 				fileList1:[],
 				editstatus:false,
 				editstatus:false,
-				id:''
+				id:'',
+				current:0,
 			}
 			}
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
@@ -293,6 +302,27 @@
 	.content{
 	.content{
 		
 		
 	}
 	}
+	 .indicator {
+		background:rgba(10, 23, 61, 0.5);
+		padding: 9rpx 5rpx;
+		border-radius: 20rpx;
+	        @include flex(row);
+	        justify-content: center;
+	
+	        &__dot {
+	             height: 6px;
+	             width: 6px;
+	             border-radius: 100px;
+	             background-color: rgba(255, 255, 255, 0.5);
+	             margin: 0 5px;
+	             transition: background-color 0.3s;
+	    
+	            &--active {
+	                 background-color: #ffffff;
+	             }
+	        }
+	}
+
 	.top{
 	.top{
 		width: 100vw;
 		width: 100vw;
 		height: 135rpx;
 		height: 135rpx;
@@ -335,4 +365,9 @@
 		padding:20rpx;
 		padding:20rpx;
 		font-size:28rpx;
 		font-size:28rpx;
 	}
 	}
+	.company-title .title{
+		color:#112253;
+		font-size:36rpx;
+	}
+	
 </style>
 </style>