hmp 4 năm trước cách đây
mục cha
commit
e02400e436

+ 1 - 1
assets/http/config.js

@@ -2,7 +2,7 @@ let config = {}
 
 
 //是否需要获取手机号
-config.isAuthPhone=false
+config.isAuthPhone=true
 
 
 

+ 2 - 2
assets/http/service.js

@@ -1,7 +1,7 @@
 import Request from 'luch-request'
 
-let baseURL = 'http://192.168.1.91:2888'
-// let baseURL = 'http://192.168.1.168:2888'
+// let baseURL = 'http://192.168.1.91:2888'
+let baseURL = 'http://192.168.1.168:2888'
 
 let tokenUrl = baseURL +
 	"/blade-auth/oauth/token?tenantId=000000&password=21232f297a57a5a743894a0e4a801fc3&username=admin"

+ 1 - 1
components/alert/votePopup.vue

@@ -7,7 +7,7 @@
 				人助力和{{vuex_active_setting.voteAndPointRate*gitfs[selected].activeVote}}个普法积分(可用于积分商城兑换商品),快为喜爱的作品加油助力吧
 			</view>
 			<scroll-view style="white-space: nowrap;" :scroll-x="true">
-				<view v-for="(item,index) in gitfs" class="gift-item">
+				<view v-for="(item,index) in gitfs" :key="index" class="gift-item">
 					<view @click.stop="selected = index;count = index" class="padding-20" :class="{'icon-box': true,'selected': index ==  selected}" >
 						<image mode="aspectFit" class="gift-img" :src="item.imgUrl"></image>
 						<view class="gift-name">{{item.name}}</view>

+ 7 - 1
pages/activity/activityDetail.vue

@@ -28,9 +28,10 @@
 		</view>
 		
 		<view class="footer-bar">
-			<u-button @click="showVote()" shape="circle" :custom-style="customStyle">给ta投票</u-button>
+			<u-button  @click="login" shape="circle" :custom-style="customStyle">给ta投票</u-button>
 		</view>
 	
+		<login ref="login" @signIn="signIn" @phoneSuccess="showVote"></login>
 		<vote-popup ref="votePopup"></vote-popup>
 	</view>
 </template>
@@ -66,6 +67,11 @@
 		methods: {
 			showVote(){
 				this.$refs.votePopup.showVote();
+			},
+			init(){
+				if (this.vuex_phone) {
+					this.showVote()
+				}
 			}
 		}
 	}