A

apps/mall/Tpl/default/Goods/index_w3g.html

@@ -221,9 +221,33 @@
 				} else if(that.tab == 1) {
 					
 				} else {
-					
+					let on = "{$marketConf['order_switch']}" == 1
+					$.ajax({
+						type: "GET",
+						url: "{:U('course/Video/index')}" + "?api=1",
+						dataType: "json",
+						success: function(res) {
+							that.loading = false
+							let res = data
+							let opt = that.options[0]
+							let array = res.data.length > 0 ? res.data : [],
+							opt.items = array.map( r => {
+								let pi = r.mz_price
+								return {
+									id: r.id,
+									title: r.video_title,
+									cover: r.image_url,
+									price: pi.price == 0 ? '免费' : ('¥' + pi.price),
+									count: on ? r.video_order_count_mark : r.video_order_count
 								}
+							})
+							opt.page = res.nowPage
+							opt.finished = res.nowPage >= res.totalPages
+							that.finished = res.nowPage >= res.totalPages
 						}
+					})
+				}
+			},
 		}
 	})
 	

apps/mall/Tpl/default/Goods/pay_w3g.html

@@ -141,7 +141,31 @@
 						if(res.status == 1) {
 							
 						} else {
-							ui.error(res.info)
+							ui.error(res.info ? res.info : res.data)
+						}
+					}
+				})
+			},
+			
+			checkPayStatus: function(num) {
+				let that = this
+				$.ajax({
+				    url: "{:U('classroom/Pay/getPayStatus')}",
+				    data:{ pay_pass_num: num},
+				    type:'post',
+				    success: function(res){
+				        try{
+				            res = JSON.parse(res)
+				            if(res.status == 1){
+				                ui.success('购买成功')
+				                setTimeout(function(){
+				                    window.location.href = res.data
+				                }, 1500);
+				            } else {
+								that.setTimeout(() => { that.checkPayStatus(num) }, 1000)
+							}
+				        }catch(e){
+				            return
 				        }
 				    }
 				})