Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go

@@ -268,13 +268,13 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 				totalfee = totalfee + lengPrice                                                                                   //已购+新增延长时间价格 + 升级差价 = 最终价格
 			}
 		}
-		log.Println("price", totalfee)
-		tmp := float64(totalfee) * 0.000001
-		if tmp < 1 {
-			if tmp != 0 {
-				totalfee = 1
-			}
-		}
+		//		log.Println("price", totalfee)
+		//		tmp := float64(totalfee) * 0.000001
+		//		if tmp < 1 {
+		//			if tmp != 0 {
+		//				totalfee = 1
+		//			}
+		//		}
 		log.Println("price", totalfee)
 
 		//创建订单

src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

@@ -100,7 +100,7 @@
 					return;
 				}
 				isReqing = true;
-				$.post("/jypay/front/wx_dataExport/getPayParm", {
+				$.post("/jypay/dataExport/weixin/getPayParm", {
 					"filterid": filterid,
 					"id": id,
 					"token": token