baibx 2 months ago
parent
commit
62bff2e270

+ 6 - 4
com.sharemao.web.xw3/src/main/java/com/sharemao/web/wx/ctrl/AuthCtrl.java

@@ -92,7 +92,8 @@ public class AuthCtrl
92
 				String defaultdev =dataJson.getString("defaultdev");
92
 				String defaultdev =dataJson.getString("defaultdev");
93
 				if(Tools.isEmpty(defaultdev)) {
93
 				if(Tools.isEmpty(defaultdev)) {
94
                     defaultdev = cursn;
94
                     defaultdev = cursn;
95
-                } else if(!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
95
+                }
96
+                if(Tools.isEmpty(cursn)&&!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
96
                     String url="http://dy.yunjia99.cn/user/index.do";
97
                     String url="http://dy.yunjia99.cn/user/index.do";
97
                     url = URLEncoder.encode(url);
98
                     url = URLEncoder.encode(url);
98
                     log.info("url="+url);
99
                     log.info("url="+url);
@@ -103,7 +104,7 @@ public class AuthCtrl
103
 				/*if(Tools.isEmpty(defaultdev)) {
104
 				/*if(Tools.isEmpty(defaultdev)) {
104
 					return new TextView("/device/getDevInfo.do");
105
 					return new TextView("/device/getDevInfo.do");
105
 				} else {
106
 				} else {
106
-                    return new TextView("/consumer/getPkgsByDevId.do");
107
+                    return new TextView("/consumer/getPkgsByDevId2.do");
107
 				}*/
108
 				}*/
108
                 return new TextView("/device/getDevInfo.do");
109
                 return new TextView("/device/getDevInfo.do");
109
 			}
110
 			}
@@ -183,7 +184,8 @@ public class AuthCtrl
183
                 String defaultdev =dataJson.getString("defaultdev");
184
                 String defaultdev =dataJson.getString("defaultdev");
184
                 if(Tools.isEmpty(defaultdev)) {
185
                 if(Tools.isEmpty(defaultdev)) {
185
                     defaultdev = cursn;
186
                     defaultdev = cursn;
186
-                } else if(!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
187
+                }
188
+                if(Tools.isEmpty(cursn)&&!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
187
                     String url="http://dy.yunjia99.cn/user/index.do";
189
                     String url="http://dy.yunjia99.cn/user/index.do";
188
                     url = URLEncoder.encode(url);
190
                     url = URLEncoder.encode(url);
189
                     log.info("url="+url);
191
                     log.info("url="+url);
@@ -194,7 +196,7 @@ public class AuthCtrl
194
                 /*if(Tools.isEmpty(defaultdev)) {
196
                 /*if(Tools.isEmpty(defaultdev)) {
195
                     return new TextView("/device/getDevInfo.do");
197
                     return new TextView("/device/getDevInfo.do");
196
                 } else {
198
                 } else {
197
-                    return new TextView("/consumer/getPkgsByDevId.do");
199
+                    return new TextView("/consumer/getPkgsByDevId2.do");
198
                 }*/
200
                 }*/
199
                 initWxJsApiSign(context);
201
                 initWxJsApiSign(context);
200
                 return new TextView("/device/getDevInfo.do");
202
                 return new TextView("/device/getDevInfo.do");

+ 2 - 2
com.sharemao.web.xw3/src/main/java/com/sharemao/web/wx/ctrl/ConsumerCtrl.java

@@ -52,8 +52,8 @@ public class ConsumerCtrl
52
 		return new TextView("/consumer.jsp");
52
 		return new TextView("/consumer.jsp");
53
 	}
53
 	}
54
 	
54
 	
55
-	@Path(value="/getPkgsByDevId.do")
56
-	public TextView getPkgsByDevId(Context context) throws UnsupportedEncodingException {
55
+	@Path(value="/getPkgsByDevId2.do")
56
+	public TextView getPkgsByDevId2(Context context) throws UnsupportedEncodingException {
57
 		Map<String, String> para = context.getParas();
57
 		Map<String, String> para = context.getParas();
58
 		String devid =GzhUtil.getDevID(context.getRequest().getSession(), para);
58
 		String devid =GzhUtil.getDevID(context.getRequest().getSession(), para);
59
 		para.put("devid", devid);
59
 		para.put("devid", devid);

+ 1 - 1
com.sharemao.web.xw3/src/main/webapp/guide.jsp

@@ -56,7 +56,7 @@
56
                 <strong><img src="/static/img/icon-guide-recharge.png">购买套餐</strong>
56
                 <strong><img src="/static/img/icon-guide-recharge.png">购买套餐</strong>
57
                 <span>对设备充值,有月套餐、季套餐、年套餐等多种套餐供你选择</span>
57
                 <span>对设备充值,有月套餐、季套餐、年套餐等多种套餐供你选择</span>
58
             </div>
58
             </div>
59
-            <div class="btn-guide" onclick="location.href='/consumer/getPkgsByDevId.do'">去充值</div>
59
+            <div class="btn-guide" onclick="location.href='/consumer/getPkgsByDevId2.do'">去充值</div>
60
         </li>
60
         </li>
61
         <li class="box">
61
         <li class="box">
62
             <div class="text">
62
             <div class="text">

+ 1 - 1
com.sharemao.web.xw3/src/main/webapp/mifi.jsp

@@ -155,7 +155,7 @@
155
 </div>
155
 </div>
156
 <div class="box">
156
 <div class="box">
157
     <div class="nav-box">
157
     <div class="nav-box">
158
-        <div class="item" onclick="location='/consumer/getPkgsByDevId.do'" style="${showmemspkg==1?'':'width: 100%;'}">
158
+        <div class="item" onclick="location='/consumer/getPkgsByDevId2.do'" style="${showmemspkg==1?'':'width: 100%;'}">
159
             <div class="icon"><img src="/static/img/icon-nav-recharge.png"><i><img src="/static/img/icon-go.png">超值闪电购</i></div>
159
             <div class="icon"><img src="/static/img/icon-nav-recharge.png"><i><img src="/static/img/icon-go.png">超值闪电购</i></div>
160
             <div class="text">套餐充值</div>
160
             <div class="text">套餐充值</div>
161
         </div>
161
         </div>