htc 22 小时之前
父节点
当前提交
a40c37acb4
共有 5 个文件被更改,包括 36 次插入31 次删除
  1. 8 1
      components/CusNotice/index.vue
  2. 1 0
      pages/home.vue
  3. 10 9
      pages/my.vue
  4. 13 19
      pages/publish.vue
  5. 4 2
      pagesPublish/fillTeamInfo.vue

文件差异内容过多而无法显示
+ 8 - 1
components/CusNotice/index.vue


+ 1 - 0
pages/home.vue

@@ -443,6 +443,7 @@
 							color: #612D11;
 							line-height: 33rpx;
 							margin-top: 3rpx;
+							text-decoration: line-through;
 						}
 					}
 				}

+ 10 - 9
pages/my.vue

@@ -6,16 +6,16 @@
 			<view class="top adfacjb">
 				<view class="top-left adfac">
 					<view class="top-left-img">
-						<image :src="userInfo.headUrl||(imgBase+'avatar.png')"></image>
+						<image :src="userInfo.headUrl||(imgBase+'my_avatar.png')"></image>
 					</view>
 					<view class="top-left-info">
 						<view class="top-left-info-name">{{userInfo.realName||'未登录'}}</view>
-						<view class="top-left-info-tip" v-if="!userInfo.id">点击立即登录</view>
+						<view class="top-left-info-tip" v-if="!userInfo.id" @click="handleLogin">点击立即登录</view>
 						<view class="top-left-info-version" v-else>{{'基础版'}}</view>
 					</view>
 				</view>
 				<view class="top-right">
-					<image :src="imgBase+'my_set.png'"></image>
+					<image :src="imgBase+'my_set.png'" @click="handleTurn('/pagesMy/userSet')"></image>
 				</view>
 			</view>
 			<view class="num adf">
@@ -34,7 +34,7 @@
 			</view>
 			<view class="preill adfacjb">
 				<view class="preill-left">深入了解支撑高价值团队的关键因素</view>
-				<view class="preill-right" @click="handleActiveDetail">立即购买</view>
+				<view class="preill-right" @click="handleTurn('/pagesPublish/rechargeCenter')">立即购买</view>
 			</view>
 			<view class="menu">
 				<view class="menu-item adfacjb" v-for="(item,index) in menuList" :key="index" @click="handleTurn(item.path)">
@@ -93,15 +93,16 @@
 			if(uni.getStorageSync('userInfo')) this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 		},
 		methods:{
+			handleLogin(){
+				uni.reLaunch({
+					url:'/pages/login'
+				})
+			},
 			handleTurn(url){
+				if(!this.isLogin()) return
 				if(!url) return
 				uni.navigateTo({ url })
 			},
-			handleActiveDetail(){
-				let url = '/pagesPublish/rechargeCenter'
-				if(this.userInfo.name) url = '';
-				url && uni.navigateTo({ url })
-			}
 		}
 	}
 </script>

文件差异内容过多而无法显示
+ 13 - 19
pages/publish.vue


+ 4 - 2
pagesPublish/fillTeamInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="default_page" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
 		<cus-header title='填写所在团队信息'></cus-header>
-		<cus-team-info-fill @handleConfirm="handleConfirm" confirmText="确定"></cus-team-info-fill>
+		<cus-team-info-fill @handleConfirm="handleConfirm" :confirmText="confirmText"></cus-team-info-fill>
 	</view>
 </template>
 
@@ -11,11 +11,13 @@
 		components:{ CusTeamInfoFill },
 		data(){
 			return {
-				type:''
+				type:'',
+				confirmText:'下一步'
 			}
 		},
 		onLoad(options) {
 			this.type = options.type||''
+			this.confirmText = options.type?'确定':'下一步'
 		},
 		methods:{
 			handleConfirm(){