自助机发布

nwjs-sdk-v0.23.7-win-x64/Config/Temp/Log/20211208.log

+
+14:54:02.006	未实现该方法或操作。:
+   在 LightFrame.Util.Converts.TypeConvert.XmlElementConvert.get_SourceType()
+   在 LightFrame.Util.Converts.ConvertCenter.<>c__DisplayClass6_0.<AddHandle>b__0()
+   在 LightFrame.Util.Threads.ThreadHelper.ExecuteCatch(DelegateEmpty vCode)

nwjs-v0.25.2-win-ia32/TubidaNewSale/js/home/base_welcome.js

@@ -61,7 +61,7 @@ $(function () {
             // todo: 这里调试修改
             // Base.config.sale = true;
             // Base.config.sort = false;
-            // Base.config.sortGuoji = true;
+			//Base.config.sortGuoji = true;
             if(Base.config.ermai){
                 $ermaiIndex.show();
             }

nwjs-v0.25.2-win-ia32/TubidaNewSale/js/home/index.js

@@ -79,7 +79,7 @@ $(function () {
         function next() {
             $(".comTime").show();
             window.timeFlag = setTimeout(function () {
-                let time = parseInt($time.text() || "0") || 0;
+                let time = parseInt($time.eq(0).text() || "0") || 0;
                 time--;
                 $time.text(time);
                 if (time < 1) {

nwjs-v0.25.2-win-ia32/TubidaNewSale/js/lhgj/getSuccess.js

 $(function(){
+    let url = {
+        pay: Base.getOrderUrl("order/wait")
+    };
+    let flag = 0;
 	
+	/**
+	 * 查询是否支付，会调用next一直查询，直到离开页面
+	 */
+	function queryPay() {
+	    Base.run(function () {
+	        let cache = getCache();
+	        let orderId = window.guojiOrderId;
+	        Base.Request(url.pay, {
+	            order: {
+	                companyId: Base.config.companyId,
+	                orderId: orderId
+	            }
+	        }, function (res) {
+				debugger;
+				let data = res.data || {};
+				let extend = data.extend || {};
+				let codeNoPdShow = parseInt(extend.codeNoPdShow||"");
+				console.log(codeNoPdShow)
+	            if (!codeNoPdShow) {
+	                showStatus("正在等待扫描...");
+	                next();
+	            } else {
+	                endEvent();
+	                showWelcome(res);
+	            }
+	        }, {
+	            error: function (res) {
+	                showStatus(res.msg || res.message);
+	                next();
+	            }
+	        });
+	    }, function (res) {
+	        showError(res);
+	    });
+	}
+
+    /**
+     * 间隔1秒后查询是否支付
+     */
+    function next() {
+        clearTimeout(flag);
+        flag = setTimeout(queryPay, 1000);
+    }
+
+    function endEvent() {
+        clearTimeout(flag);
+    }
+	
+	// 返回根据缓存加载数据的方法
+	setPageLoad(function (cache, $page) {
+	    let res = Base.getRes(cache.data);
+	    if (res.error) {
+	        showError(res);
+	        return;
+	    } else {
+			document.querySelector(".guojiCode").setAttribute("src",window.guojiSuccessImg)
+			window.guojiSuccessImg=""
+	        // 加载订单产品信息
+	        queryPay();
+	    }
+	});
+	
+	setPageClose(function () {
+	    endEvent();
+	});
 });
\ No newline at end of file

nwjs-v0.25.2-win-ia32/TubidaNewSale/js/lhgj/manualNumbering.js

@@ -47,6 +47,7 @@ $(function(){
 			cache.buyNum = $mnInput.val();
 			cache.mobile = $mnInput2.val();
 			$mnInput2.val("");//清空输入框的电话号码
+			$mnInput.val(1);//清空输入框的电话号码
 			showResPage(null,"/page/lhgj/workScanCode.html");
 		}
 	});

nwjs-v0.25.2-win-ia32/TubidaNewSale/js/lhgj/scanCode.js

@@ -67,6 +67,7 @@ $(function(){
 			    orderId: orderId,
 			    visitors: loadData.visitors ||[]
 			};
+			window.guojiOrderId=orderId
 			let visitor = req.visitors[0] || {};
 			visitor.visitorMobile = order.mobile;
 			// 请求地址
@@ -82,6 +83,8 @@ $(function(){
 						showError({msg: "生成二维码错误，返回路径为空"});
 						return;
 					}
+					showWaitWelcome(null,"/page/lhgj/getSuccess.html");
+					window.guojiSuccessImg=res
 					// pay.PayCodeUrl = res;
 				}, function (res) {
 					showError(res);
@@ -89,7 +92,7 @@ $(function(){
 				
 			}, {
 			    error: function (res) {
-					showResPage(null,"/page/lhgj/getFailure.html");
+					showWaitWelcome(null,"/page/lhgj/getFailure.html");
 			        // showError(res);
 			    }
 			});
@@ -97,7 +100,7 @@ $(function(){
             error: function (res) {
 				// 狀態碼 1000，代表員工取號，跳轉到該頁面
 				if(res.code == "5000"){
-					showResPage(null,"/page/lhgj/manualNumbering.html");
+					showWaitWelcome(null,"/page/lhgj/manualNumbering.html");
 				}
 				else{
 					showError(res);

nwjs-v0.25.2-win-ia32/TubidaNewSale/js/lhgj/workScanCode.js

@@ -68,6 +68,7 @@ $(function(){
 			let data = res.data || {};
 			let extend = data.extend || {};
 			let codeNoPd = extend.codeNoPd||"";
+			window.guojiOrderId=data.ordar.orderId||""
 			// 调用C#方法，生成二维码返回路径，根据路径进行操作
 			hard.__execute("ReleaseQR", {
 			    Code: codeNoPd
@@ -76,6 +77,9 @@ $(function(){
 			        showError({msg: "生成二维码错误，返回路径为空"});
 			        return;
 			    }
+				showWaitWelcome(null,"/page/lhgj/getSuccess.html");
+				window.guojiSuccessImg=res
+				
                 // pay.PayCodeUrl = res;
 			}, function (res) {
 			    showError(res);

nwjs-v0.25.2-win-ia32/TubidaNewSale/page/home/base_welcome.html

@@ -54,7 +54,7 @@
 		<img src="../../img/lhgj/lhgjIcon.png" class="guojiTopImg">
 	</div>
 	<div  style="margin-bottom: 173px;" class="guojiTitle">
-		<span>云端之眼·高空观景台</span>
+		<span class="titleLogin"></span>
 	</div>
 	<div style="margin-bottom: 46px;" class="guojiTitle">
 		<span>欢迎使用</span>

nwjs-v0.25.2-win-ia32/TubidaNewSale/page/lhgj/getFailure.html

@@ -4,7 +4,7 @@
 		<img src="../../img/lhgj/lhgjIcon.png" class="guojiTopImg">
 	</div>
 	<div class="guojiTitle" style="margin-bottom: 173px;">
-		<span>云端之眼·高空观景台自助排号</span>
+		<span><i class="titleLogin">云端之眼·高空观景台</i>自助排号</span>
 	</div>
 	<div style="margin-bottom: 23px;color: #FF0000;" class="guojiTitle">
 		<span>取号失败</span>

nwjs-v0.25.2-win-ia32/TubidaNewSale/page/lhgj/getSuccess.html

@@ -4,7 +4,7 @@
 		<img src="../../img/lhgj/lhgjIcon.png" class="guojiTopImg">
 	</div>
 	<div class="guojiTitle" style="margin-bottom: 173px;">
-		<span>云端之眼·高空观景台自助排号</span>
+		<span><i class="titleLogin">云端之眼·高空观景台</i>自助排号</span>
 	</div>
 	<div style="margin-bottom: 23px;color: #FF0000;" class="guojiTitle">
 		<span>取号成功</span>
@@ -15,10 +15,10 @@
 	<div style="font-size: 40px;color: #FF0000;margin-bottom: 29px;">
 		<span>（支持微信/支付宝）</span>
 	</div>
-	<div class="guojiCode" style="background-color: red;">
-	</div>
+	<img class="guojiCode" />
+	
 	<div>
-		<span style="color: #FF0000;font-size: 40px;">60s</span>
+		<span style="color: #FF0000;font-size: 40px;" class="IndexTime"></span>s
 	</div>
 	<div class="guojiBottom">
 		<span>技术支持</span>

nwjs-v0.25.2-win-ia32/TubidaNewSale/page/lhgj/manualNumbering.html

@@ -11,7 +11,7 @@
 			<img src="../../img/lhgj/lhgjIcon.png" class="guojiTopImg">
 		</div>
 		<div class="guojiTitle" style="margin-bottom: 100px;">
-			<span>云端之眼·高空观景台自助排号</span>
+			<span><i class="titleLogin">云端之眼·高空观景台</i>自助排号</span>
 		</div>
 		<div class="guojiDropDown">
 			<span>购票渠道</span>
@@ -33,7 +33,7 @@
 		<br>
 		<div class="guojiTel" style="margin-top:35px;">
 			<span>购票手机</span>
-			<input type="text" placeholder="请输入购票联系手机号码" class="mnInput2">
+			<input type="text" placeholder="请输入购票联系手机号码" class="mnInput2" maxlength="11">
 		</div>
 		<div class="phoneTip" style="color: #FF0000;font-size: 24px;display:none;">
 			请输入正确手机号码

nwjs-v0.25.2-win-ia32/TubidaNewSale/page/lhgj/scanCode.html

@@ -4,7 +4,7 @@
 			<img src="../../img/lhgj/lhgjIcon.png" class="guojiTopImg">
 		</div>
 		<div class="guojiTitle" style="margin-bottom: 173px;">
-			<span>云端之眼·高空观景台自助排号</span>
+			<span><i class="titleLogin">云端之眼·高空观景台</i>自助排号</span>
 		</div>
 		<div style="margin-bottom: 58px;color: #FF0000;font-size:46px;" class="guojiTitle">
 			<p>请将您购票填写的任意身份证</p>

nwjs-v0.25.2-win-ia32/TubidaNewSale/page/lhgj/workScanCode.html

@@ -4,7 +4,7 @@
 			<img src="../../img/lhgj/lhgjIcon.png" class="guojiTopImg">
 		</div>
 		<div class="guojiTitle" style="margin-bottom: 173px;">
-			<span>云端之眼·高空观景台自助排号</span>
+			<span><i class="titleLogin">云端之眼·高空观景台</i>自助排号</span>
 		</div>
 		<div style="margin-bottom: 58px;color: #FF0000;font-size:46px;font-weight:bold;">
 			请将您购票填写的任一身份证