udata

bailicangdu · Dec 15, 2016 · 8ddc50f · 8ddc50f
1 parent 353ae8b
commit 8ddc50f
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 12 deletions.
diff --git a/happyfri/static/img/1-1.jpg b/happyfri/static/img/1-1.jpg
diff --git a/happyfri/static/img/1-2.png b/happyfri/static/img/1-2.png
diff --git a/happyfri/static/js/app.js b/happyfri/static/js/app.js
diff --git a/happyfri/static/js/home.38898271af93cb982b78.min.js b/happyfri/static/js/home.38898271af93cb982b78.min.js
diff --git a/happyfri/static/js/home.7e7f30f9d1568f13c373.min.js b/happyfri/static/js/home.7e7f30f9d1568f13c373.min.js
diff --git a/happyfri/static/js/item.a4009c80924b9b00c7eb.min.js b/happyfri/static/js/item.a4009c80924b9b00c7eb.min.js
diff --git a/happyfri/static/js/item.e42493fb55e544905346.min.js b/happyfri/static/js/item.e42493fb55e544905346.min.js
diff --git a/happyfri/static/js/manifest.js b/happyfri/static/js/manifest.js
diff --git a/src/components/itemcontainer.vue b/src/components/itemcontainer.vue
@@ -20,8 +20,8 @@
     				</ul>
     			</div>
     		</div>
-    		<button class="next_item button_style" @click="nextItem" v-if="itemNum < itemDetail.length"></button>
-    		<button class="submit_item button_style" v-else @click="submitAnswer"></button>
+    		<span class="next_item button_style" @click="nextItem" v-if="itemNum < itemDetail.length"></span>
+    		<span class="submit_item button_style" v-else @click="submitAnswer"></span>
     	</div>
   	</section>
 </template>
@@ -47,6 +47,7 @@ export default {
 	}),
   	methods: {
   		nextpage: function (){
+  			this.$router.push('item')  ///////还分身乏术地方开始发售
   			if (this.$store.state.activeCodeState == 200) {
   				this.$router.push('item')
   			}else if (this.$store.state.activeCodeState == 300) {

diff --git a/src/images/1-1.jpg b/src/images/1-1.jpg
diff --git a/src/images/1-2.png b/src/images/1-2.png
diff --git a/src/images/3-1.png b/src/images/3-1.png
diff --git a/src/main.js b/src/main.js
@@ -28,7 +28,7 @@ let img = new Image();
 img.src = basePath + 'static/img/1-1.jpg';
 let url = window.location.href;
 if (!(/users_id=/gi.test(url))) {
-	window.location.href = 'http://wxinterface.putaoevent.com?wx_account_id=' + weixinOrder + '&callback_url=' + basePath + '?' + activeTopicId
+	//window.location.href = 'http://wxinterface.putaoevent.com?wx_account_id=' + weixinOrder + '&callback_url=' + basePath + '?' + activeTopicId
 }
 
 let jssdkUrl = url.split('#')[0]
@@ -56,7 +56,7 @@ wx.ready(function() {
 		title: '第一个题目，进来才知道', // 分享标题
 		desc: '这些知识我打赌你一个都不知道', // 分享描述
 		link: basePath + '?' + activeTopicId, // 分享链接
-		imgUrl:basePath + 'pthome.jpeg', // 分享图标
+		imgUrl: basePath + 'pthome.jpeg', // 分享图标
 		type: 'link', // 分享类型,music、video或link，不填默认为link
 		dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
 	});

diff --git a/src/store/index.js b/src/store/index.js
@@ -26,7 +26,69 @@ const state = {
 	active_topic_id: '',
 	timer: '',
 	TransformNum: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二', '十三', '十四', '十五', '十六', '十七', '十八', '十九', '二十', '二十一', '二十二', '二十三', '二十四', '二十五', '二十六', '二十七', '二十八', '二十九', '三十'],
-	itemDetail: [],
+	itemDetail: [{
+		"topic_id": 20,
+		"active_topic_id": 4,
+		"type": "ONE",
+		"topic_name": "是分身乏术分",
+		"active_id": 1,
+		"active_title": "欢乐星期五标题",
+		"active_topic_phase": "第一周",
+		"active_start_time": "1479139200",
+		"active_end_time": "1482163200",
+		"topic_answer": [{
+			"topic_answer_id": 66,
+			"topic_id": 20,
+			"answer_name": "说的发",
+			"is_standard_answer": 0
+		}, {
+			"topic_answer_id": 67,
+			"topic_id": 20,
+			"answer_name": "说的发",
+			"is_standard_answer": 0
+		}, {
+			"topic_answer_id": 68,
+			"topic_id": 20,
+			"answer_name": "说的发生",
+			"is_standard_answer": 0
+		}, {
+			"topic_answer_id": 69,
+			"topic_id": 20,
+			"answer_name": "说的发",
+			"is_standard_answer": 1
+		}]
+	}, {
+		"topic_id": 20,
+		"active_topic_id": 4,
+		"type": "ONE",
+		"topic_name": "是分身乏术分身乏术分似懂非懂所发生的发生分身乏术分是非得失分身乏术说",
+		"active_id": 1,
+		"active_title": "欢乐星期五标题",
+		"active_topic_phase": "第一周",
+		"active_start_time": "1479139200",
+		"active_end_time": "1482163200",
+		"topic_answer": [{
+			"topic_answer_id": 66,
+			"topic_id": 20,
+			"answer_name": "说的发生的发生的分身乏术的发生的的发分服",
+			"is_standard_answer": 0
+		}, {
+			"topic_answer_id": 67,
+			"topic_id": 20,
+			"answer_name": "说的发生的发生的分身乏术的发生的术分服",
+			"is_standard_answer": 0
+		}, {
+			"topic_answer_id": 68,
+			"topic_id": 20,
+			"answer_name": "说的发生的发生的分身乏术的发生身乏术分服",
+			"is_standard_answer": 0
+		}, {
+			"topic_answer_id": 69,
+			"topic_id": 20,
+			"answer_name": "说的发生的发生的分失分身乏术分服",
+			"is_standard_answer": 1
+		}]
+	}],
 	answerid: {}
 }