Merge branch 'master' of ssh://git.9026.com:2212/gubai/IHG

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "hotel_uni",
-    "appid" : "__UNI__807A871",
+    "appid" : "__UNI__9140D70",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages.json

@@ -331,7 +331,7 @@
 		"list": [{
 			"name": "goood-lucky", //模式名称
 			"path": "pages/goods/goods-lucky/index", //启动页面，必选
-			"query": "draw_no=JqgtkNtFcoAT" //启动参数，在页面的onLoad函数里面得到
+			"query": "draw_no=EkryhbPL6fZW" //启动参数，在页面的onLoad函数里面得到
 		}]
 	}
 }

pages/goods/goods-lucky/index.vue

@@ -4,7 +4,8 @@
 		<view class="spinning" :style="{backgroundImage:'url('+bigWheelConfig.big_wheel_bg+')'}">
 			<view class="spinning-title" style="opacity: 0;">
 				<text>{{drawInfo.draw_template.name?drawInfo.draw_template.name:"幸运大轮盘"}}</text>
-			</view>
+			</view>
+			<view style="width:0px;height:0px;"><image src="http://t9.9026.com/imgs/step01.png" style="width: 285rpx;height: 341rpx;transform: translate(232rpx, 167rpx);"/></view>
 <!-- 			<q-turntable isRenderImage ref="turntable" :areaNumber='9' @start="turntableStart" @success="turntableSuccess">
 			</q-turntable> -->
 			<q-turntable ref="turntable" :isValid="drawInfo.id" @start="turntableStart" :big_wheel_disc="bigWheelConfig.big_wheel_disc" :big_wheel_button="bigWheelConfig.big_wheel_button"/>
@@ -205,6 +206,12 @@
 					if(res.code == 0){
 						this.drawInfo = res.data;
 						this.$refs.turntable.init(this.drawInfo.draw_template.draw_config);
+						// if(this.drawInfo.draw_template.draw_config.length == 0 || !this.drawInfo.draw_template.draw_config){
+						// 	this.error.info = "活动未开放";
+						// 	this.$refs.dialogError.open()
+						// }else{
+						// 	this.$refs.turntable.init(this.drawInfo.draw_template.draw_config);
+						// }
 					}else{
 						this.error.info = res.msg ? res.msg : "暂无权限";
 						this.$refs.dialogError.open()

pages/index/vote-detail/index.vue

@@ -545,37 +545,7 @@
 						}
 					})
 				}
-			},
-						
-			// 跳转其他小程序
-			// goJoin() {
-			// 	this.$utils.jumpJoinVip().then( _=>{
-			// 		const page = this.getPageUrl()
-			// 		let user_id = ''
-			// 		if (this.admin != null) {
-			// 			user_id = this.admin.id
-			// 		} else {
-			// 			user_id = 0
-			// 		}
-			// 		this.$api.my.userMemberAdd({
-			// 			user_id,
-			// 			page,
-			// 		})
-			// 		//增加票数
-			// 		this.$api.my.userJoinVip({
-			// 			source_type: 1,
-			// 			source_id: this.sourceId
-			// 		}).then(res => {
-			// 			console.log(res)
-			// 			uni.setStorage({
-			// 				key: `is_vip_${this.voteDetail.id}`,
-			// 				data: 1,
-			// 			});
-			// 			this.is_vip = true
-			// 			this.closeVote()
-			// 		})
-			// 	})
-			// },
+			},
 			// 投票
 			goVote(id, again = false) {
 				if(this.throttle) return;
@@ -617,13 +587,6 @@
 			
 			//帮我拉票
 			showPoster(){
-				/**
-				 * 注意这里的图片接口好像有问题 .activity.cover_img信息
-				 * 报错内容：{"errMsg":"getImageInfo:fail invalid"}
-				 * 可能是图片域名不在微信开发者白名单
-				 * 添加不校验规则依然报错
-				 * 核实后取消下方注释即可
-				 */
 				this.$refs.poster.show({
 					name: this.voteDetail.project_name,
 					title: this.voteDetail.activity.title,

setting.js

@@ -1,7 +1,7 @@
 /**
  * Created by JianJia.Zhou<jianjia.zhou> on 2022/3/18.
  */
-const IS_DEV = process.env.NODE_ENV === 'development1'
+const IS_DEV = process.env.NODE_ENV === 'development'
 
 const URL = 'https://t9.9026.com'
 // const URL = 'https://ihg.9026.com'