3.0加密优化

yvan.ni
1 parent 3095a6fd
Showing 41 changed files with 1255 additions and 722 deletions
app.js
components/diy_user_tools_services/diy_user_tools_services.js
packageA/pages/cart2_ser/cart2_ser.js
packageA/pages/my_service/appment_main.js
packageA/pages/my_service/beauty_deta.js
packageA/pages/my_service/tment_details.js
packageA/pages/my_service/tment_eval.js
packageA/pages/my_service/tment_order_list.js
packageA/pages/my_service2/appment_main.js
packageA/pages/my_service2/beauty_deta.js
packageA/pages/my_service2/tment_details.js
packageA/pages/my_service2/tment_eval.js
packageA/pages/my_service2/tment_order_list.js
packageA/pages/serviceCard_pd/cart/cart.js
packageA/pages/serviceCard_pd/cart_wk/cart_wk.js
packageB/pages/evaluate/evaluate.js
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/payForAnother/payForAnother.js
packageC/pages/presell/cart/cart.js
@@ -2,8 +2,8 @@ var t = require(&quot;setting.js&quot;), o = require(&quot;./utils/auth.js&quot;), a = require(&quot;./ut
 var os = t;
 var regeneratorRuntime = require('./utils/runtime.js');
 var api = require("./api/api.js");
-
 var wxlog = require("./utils/wxlog.js");
+var md5 = require("./utils/md5.min.js");
  
  
 //公共方法和变量
@@ -99,6 +99,9 @@ App({
         //检查更新
         this.checkUpdateVersion();
  
+        wx.removeStorageSync('ukey');
+        wx.removeStorageSync('api_token');
+
         var t = this.globalData.setting;
         //console.log(t)
         t.resourceUrl = t.url + "/template/mobile/rainbow";
@@ -149,7 +152,7 @@ App({
             //     })
             // }
             // if(app.globalData.user_id){  //-- 启用默认的user_id --
-            
+            //
             //     app.promiseGet("/api/weshop/users/get/" + app.globalData.setting.stoid + "/" + app.globalData.user_id,{}).then(res=>{
             //         app.globalData.is_get_login=1;
             //         if(res.data.code==0){
@@ -217,7 +220,6 @@ App({
                     }
                 })
             //}
-           
         }
  
         wx.getSystemInfo({
@@ -961,44 +963,91 @@ App({
  
     },
  
-    //---promise的使用get----
+        
+    //---promise的使用get,data里面加一个参数，不需要默认带----
     promiseGet: function (url, data) {
+
+        var th=this;
+
+
         if (url.indexOf("http") == -1) url = this.globalData.setting.url + url;
         return new Promise((resolve, reject) => {
+
+        th.ck_api_token((api_tk)=>{
             data.isShowLoading && wx.showLoading();
+            //增加门店id和配送方式
+            //is_no_def不需要默认参数
+
+            var url1=url;
+            var arr_in_url=ut.getParams(url1);
+
+            var header={ "content-type": "application/x-www-form-urlencoded" };
+            var now=ut.gettimestamp();
+
+            var new_data={...arr_in_url,...data.data};
+            var tk=a.set_req_sign(new_data,url1,now,api_tk);
+            if(tk){
+            header.reqtime=now;
+            header.token=tk;
+            header.ukey=api_tk.userkey
+            }
+
             wx.request({
-                url,
-                method: 'GET',
-                header: { "content-type": "application/x-www-form-urlencoded" },
-                data: data.data,
-                success(res) {
-                    data.isShowLoading && wx.hideLoading();
-                    resolve(res);
-                },
-                fail(err) { data.isShowLoading && wx.hideLoading(); reject(err); }
+            url,
+            method: 'GET',
+            header: header,
+            data: data.data,
+            success(res) {
+                data.isShowLoading && wx.hideLoading();
+                resolve(res);
+            },
+            fail(err) { data.isShowLoading && wx.hideLoading(); reject(err); }
             })
         })
+
+
+        })
     },
  
  
     //---promise的使用get----
     requestGet: function (url, data) {
+
+        var url1=url;
+        var arr_in_url=ut.getParams(url1);
         if (url.indexOf("http") == -1) url = this.globalData.setting.url + url;
+
+        this.ck_api_token((api_tk)=> {
+
         data.isShowLoading && wx.showLoading();
+
+        var header= {"content-type": "application/x-www-form-urlencoded"};
+        var now=ut.gettimestamp();
+
+        var new_data={...arr_in_url,...data.data};
+        var tk=a.set_req_sign(new_data,url1,now,api_tk);
+
+        if(tk){
+            header.reqtime=now;
+            header.token=tk;
+            header.ukey=api_tk.userkey
+        }
+
         wx.request({
             url,
             method: 'GET',
-            header: { "content-type": "application/x-www-form-urlencoded" },
+            header:header,
             data: data.data,
             success(res) {
-                data.isShowLoading && wx.hideLoading();
-                data.success(res);
+            data.isShowLoading && wx.hideLoading();
+            data.success(res);
             },
             fail(err) {
-                data.isShowLoading && wx.hideLoading();
-                if (data.fail) data.fail(err);
+            data.isShowLoading && wx.hideLoading();
+            if (data.fail) data.fail(err);
             }
         })
+        })
     },
  
  
@@ -1794,8 +1843,150 @@ App({
         if(type)
             url += "&type=1";
         this.goto(url);
+    },
+
+
+    
+  //判断有没有获取到api_token
+  ck_api_token(func){
+    var api_token = wx.getStorageSync('api_token');
+    var api_token_time = wx.getStorageSync('api_token_time');
+    //token有存在本地的时候
+    if(api_token){
+      //判断有没有超出token的时间，超出的话就要重头拿token
+      var now=ut.formar_day();
+      if(now!=api_token_time){
+        //调用接口获取token
+        this.get_api_token(func);
+        return false;
+      }
+      func(api_token);
+      return  false;
     }
+    this.get_api_token(func);
+  },
+
+  //获取api_token
+  get_api_token(func){
+
+    var api_token = wx.getStorageSync('api_token');
+    var api_token_time = wx.getStorageSync('api_token_time');
+    //token有存在本地的时候
+    if(api_token){
+      //判断有没有超出token的时间，超出的话就要重头拿token
+      var now=ut.formar_day();
+      if(now==api_token_time){
+        if(func)  func(api_token);
+        return false;
+      }
+    }
+
+    if(this.globalData.get_tking){
+       setTimeout(()=>{
+           this.get_api_token(func);
+       },1000)
+       return false;
+    }
+
+    this.globalData.get_tking=1;
+    var th=this;
+    var ukey = wx.getStorageSync('ukey');
+    if(!ukey){
+      var url = th.globalData.setting.url + '/api/weshop/store/geStoreKey';
+      var data={
+        store_id:th.globalData.setting.stoid
+      }
+      var token1=md5(JSON.stringify(data)).toUpperCase();
+
+      console.log('tk1_fir:'+token1);
+      console.log('tk1_fir1:'+'GETSTOREKEY'+token1+th.globalData.setting.environment_key);
+
+      var str = md5('GETSTOREKEY'+token1+th.globalData.setting.environment_key).toUpperCase();
+      data.token=str;
+
+      wx.request({
+        url: url,
+        data: JSON.stringify(data),
+        method: "POST",
+        header: {
+          'content-type': 'application/json'
+        },// 设置请求的 header
+        success: function (res) {
+          if(res.data.code==0){
+            wx.setStorageSync("ukey", res.data.data.ukey);
+            th.get_api_token2(func);
+          }else{
+            th.confirmBox(res.data.msg)
+          }
+        },
+        fail: function (res) {
+          ut.m_toast('网络繁忙，请稍后重试');
+        }
+      })
+      return false;
+    }
+
+    this.get_api_token2(func);
+
+  },
+
+  get_api_token2(func){
+    var th=this;
+    var ukey = wx.getStorageSync('ukey');
+    var dd_json={
+      store_id:th.globalData.setting.stoid,
+      ukey:ukey
+    }
+
+    var ty= new Date();
+    var c="-";
+
+    var m=ty.getMonth() + 1;
+    if(m<10) m="0"+m;
+    var day=ty.getDate();
+    if(day<10) day="0"+day;
+
+    var nday=ty.getFullYear() +c+m+c+day;
+
+    //console.log('tk1_str:'+JSON.stringify(dd_json));
+    var tk1=md5(JSON.stringify(dd_json)).toUpperCase();
+    //console.log(tk1)
+    var tk2_str='GETAPITOKEN'+tk1+nday+th.globalData.setting.environment_key;
+    //console.log("tk2_str:"+tk2_str);
+    var tk2=md5(tk2_str).toUpperCase();
+    //console.log(tk1)
+    var url = th.globalData.setting.url + '/api/weshop/store/getApiToken';
+    var data1={
+      'store_id':th.globalData.setting.stoid,
+      'ukey':ukey,
+      'token':tk2
+    }
+    wx.request({
+      url: url,
+      data: JSON.stringify(data1),
+      method: "POST",
+      header: {
+        'content-type': 'application/json'
+      },// 设置请求的 header
+      success: function (res) {
+        if(res.data.code==0){
+          //记录当天，隔天就要重新刷新
+          var now=ut.formar_day();
+          var api_token =res.data.data;
+          wx.setStorageSync('api_token',api_token);
+          wx.setStorageSync('api_token_time',now);
+          th.globalData.get_tking=0;
+          if(func) func(api_token);
+        }else{
+          getApp().confirmBox(res.data.msg)
+        }
+      },
+      fail: function (res) {
+        ut.m_toast('网络繁忙，请稍后重试');
+      }
+    })
  
+  }
  
  
  
@@ -232,12 +232,14 @@ Component({
         }
         //-- 如果是有新的tool要添加进去 --
         for (let ig = 0; ig <f_user_tool.length ; ig++) {
+
+          var item=f_user_tool[ig];
           let fd= list.find(function (e){
             return e.id==f_user_tool[ig].id;
           })
           if(fd) continue;
           let ob={
-            show:true,id:fd.id,icoimg:fd.icoimg,name:item.name,new_weappurl:item.new_weappurl
+            show:true,id:item.id,icoimg:item.icoimg,name:item.name,new_weappurl:item.new_weappurl
           }
           list.push(ob);
         }
@@ -640,142 +640,136 @@ Page({
  
  
 		pdata = item;
-		var str = JSON.stringify(pdata);
-		console.log("支付数据");
-		console.log(str);
+		//var str = JSON.stringify(pdata);
+		//console.log("支付数据");
+		//console.log(str);
 		//return false;
 		wx.showLoading({
 			title: "加载中"
 		});
-		wx.request({
-			url: oo.url + '/api/weshop/recharge/saveRecharge',
-			data: str,
-			method: 'POST',
-			header: {
-				'content-type': 'application/json'
-			}, // 设置请求的 header
-			success: function(res) {
-
-				wx.hideLoading();
-				if (res.statusCode == 200) {
-					var data = res.data;
-					if (data.code == 0) {
-						th.data.order_id = data.data.order_id;
-						// console.log('myyyyyyyyyyyyyyyyyy', data.data);
-						if (th.data.is_cart) {
-							var list = th.data.cartlist_y;
-							for (var i = 0; i < list.length; i++) {
-								//删除购物车
-								a.delete("/api/weshop/cartService/del/" + oo.stoid + "/" + list[i].id, {});
-							}
-						}
-						var order_amount = pdata.account;
-						//要进行判断，如果是用微信支付，就要跳转到支付界面
-						if (order_amount > 0) {
-							th.setData({
-								isclose: 0
-							});
  
-							t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder")
-							t_pay.pay(
-								{
-										parentSn: data.data.order_sn,
-										store_id: oo.stoid
-									},function (){
-										        wx.showToast({
-													title: '购买成功',
-													icon: 'success',
-													duration: 2000
-												});
-												setTimeout(function () {
-													wx.reLaunch({
-														url: "/packageG/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id,
-													})
-												}, 1000)
-
-								    },function (e){
-
-									        console.log('kkkkkkk');
+		getApp().request.promisePost("/api/weshop/recharge/saveRecharge", {
+			data: pdata,
+			is_json:1
+		}).then(res => {
+			wx.hideLoading();
+			if (res.statusCode == 200) {
+				var data = res.data;
+				if (data.code == 0) {
+					th.data.order_id = data.data.order_id;
+					// console.log('myyyyyyyyyyyyyyyyyy', data.data);
+					if (th.data.is_cart) {
+						var list = th.data.cartlist_y;
+						for (var i = 0; i < list.length; i++) {
+							//删除购物车
+							a.delete("/api/weshop/cartService/del/" + oo.stoid + "/" + list[i].id, {});
+						}
+					}
+					var order_amount = pdata.account;
+					//要进行判断，如果是用微信支付，就要跳转到支付界面
+					if (order_amount > 0) {
+						th.setData({
+							isclose: 0
+						});
  
+						t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder")
+						t_pay.pay(
+							{
+									parentSn: data.data.order_sn,
+									store_id: oo.stoid
+								},function (){
 											wx.showToast({
-												title: e,
-												icon: 'none',
+												title: '购买成功',
+												icon: 'success',
 												duration: 2000
 											});
-
 											setTimeout(function () {
 												wx.reLaunch({
-													url: "/pages/user/order_list/order_list?index=2&tabindex=1",
+													url: "/packageG/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id,
 												})
 											}, 1000)
  
-							     	}
-							)
-							
+								},function (e){
  
-							// getApp().request.post("/api/weshop/order/pay/createRechargeOrder", {
-							// 	data: {
-							// 		parentSn: data.data.order_sn,
-							// 		store_id: oo.stoid
-							// 	},
-							// 	success: function(su) {
-							//
-							// 		if(su.data.code==0) {
-							//
-							// 			var n = su.data.data;
-							// 			// console.log('su---->', n);
-							// 			let order_id = data.data.order_id;
-							// 			th.weixinPay(n,
-							// 				function () {
-							// 					// getApp().showWarning("购买成功");
-							// 					wx.showToast({
-							// 						title: '购买成功',
-							// 						icon: 'success',
-							// 						duration: 2000
-							// 					});
-							// 					setTimeout(function () {
-							// 						wx.reLaunch({
-							// 							url: "/packageG/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
-							// 						})
-							// 					}, 1000)
-							// 				},
-							// 				function () {
-							// 					getApp().showWarning("支付失败");
-							// 					setTimeout(function () {
-							// 						wx.reLaunch({
-							// 							url: "/pages/user/order_list/order_list?index=2&tabindex=1",
-							// 						})
-							// 					}, 1000)
-							// 				})
-							// 		}else{
-							//
-							// 			this.data.is_summit_ing = 0;
-							//
-							// 			wx.showToast({
-							// 				title: su.data.msg,
-							// 				icon: 'none',
-							// 				duration: 2000
-							// 			});
-							// 		}
-							// 	}
-							// })
-						}
-					} else {
-						th.data.is_summit_ing = 0; //是否提交中
-						getApp().confirmBox(data.msg);
+										console.log('kkkkkkk');
+
+										wx.showToast({
+											title: e,
+											icon: 'none',
+											duration: 2000
+										});
+
+										setTimeout(function () {
+											wx.reLaunch({
+												url: "/pages/user/order_list/order_list?index=2&tabindex=1",
+											})
+										}, 1000)
+
+								}
+						)
+
+
+						// getApp().request.post("/api/weshop/order/pay/createRechargeOrder", {
+						// 	data: {
+						// 		parentSn: data.data.order_sn,
+						// 		store_id: oo.stoid
+						// 	},
+						// 	success: function(su) {
+						//
+						// 		if(su.data.code==0) {
+						//
+						// 			var n = su.data.data;
+						// 			// console.log('su---->', n);
+						// 			let order_id = data.data.order_id;
+						// 			th.weixinPay(n,
+						// 				function () {
+						// 					// getApp().showWarning("购买成功");
+						// 					wx.showToast({
+						// 						title: '购买成功',
+						// 						icon: 'success',
+						// 						duration: 2000
+						// 					});
+						// 					setTimeout(function () {
+						// 						wx.reLaunch({
+						// 							url: "/packageG/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
+						// 						})
+						// 					}, 1000)
+						// 				},
+						// 				function () {
+						// 					getApp().showWarning("支付失败");
+						// 					setTimeout(function () {
+						// 						wx.reLaunch({
+						// 							url: "/pages/user/order_list/order_list?index=2&tabindex=1",
+						// 						})
+						// 					}, 1000)
+						// 				})
+						// 		}else{
+						//
+						// 			this.data.is_summit_ing = 0;
+						//
+						// 			wx.showToast({
+						// 				title: su.data.msg,
+						// 				icon: 'none',
+						// 				duration: 2000
+						// 			});
+						// 		}
+						// 	}
+						// })
 					}
 				} else {
 					th.data.is_summit_ing = 0; //是否提交中
-					console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
+					getApp().confirmBox(data.msg);
 				}
-			},
-			fail: function() {
-				th.data.is_summit_ing = 0; //是否提交中	
-				wx.hideLoading();
-				console.log("index.js wx.request CheckCallUser fail");
-			},
-			complete: function() {}
-		})
+			} else {
+				th.data.is_summit_ing = 0; //是否提交中
+				console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
+			}
+		}).catch(function(err) {
+			// error
+			th.data.is_summit_ing = 0; //是否提交中
+			wx.hideLoading();
+			console.log("index.js wx.request CheckCallUser fail");
+		});
 	},
  
 	cart_set_err: function(e) {
@@ -117,15 +117,11 @@ Page({
       "isxz": 1
  
     }
-    var data = JSON.stringify(json);
-    wx.request({
-      url: url,
-      data: json,
-      method: 'post',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+    //var data = JSON.stringify(json);
+
+    getApp().request.promisePost(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         th.setData({
           is_sub: 0
         })
@@ -177,7 +173,6 @@ Page({
           getApp().my_warnning(res.data.msg, 0, th);
           th.settime();
         }
-      }
     })
  
   },
@@ -170,14 +170,10 @@ Page({
       };
       var data = JSON.stringify(json);
       var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-      wx.request({
-        url: url,
-        data: data,
-        method: 'put',
-        header: {
-          'content-type': 'application/json'
-        }, // 设置请求的 header
-        success: function(res) {
+
+      getApp().request.promisePut(url, {
+        data: json,is_json:1,is_normal:1
+      }).then(res => {
           if (res.data.code == 0) {
             getApp().my_warnning(res.data.data, 1, th);
             setTimeout(function() {
@@ -189,7 +185,7 @@ Page({
           } else {
             getApp().my_warnning(res.data.msg, 0, th);
           }
-        }
+
       })
     } else {
       var pages = getCurrentPages(); //当前页面
@@ -374,20 +370,16 @@ Page({
     };
     var data = JSON.stringify(json);
     var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-    wx.request({
-      url: url,
-      data: data,
-      method: 'put',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+
+    getApp().request.promisePut(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         if (res.data.code == 0) {
           getApp().my_warnning("更改成功", 0, th);
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
+
     })
   },
   //预览头像
@@ -41,14 +41,9 @@ Page({
         };
         var data = JSON.stringify(json);
         var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-        wx.request({
-          url: url,
-          data: data,
-          method: 'put',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function(res) {
+        getApp().request.promisePut(url, {
+          data: json,is_json:1,is_normal:1
+        }).then(res => {
             my_confirm.open_cancel(0);
             if (res.data.code == 0) {
               getApp().my_warnning("取消成功", 1, th);
@@ -59,7 +54,7 @@ Page({
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
             }
-          }
+
         })
       }
     );
@@ -177,15 +177,12 @@ Page({
       "star": stars + 1,
       "storeId": a.stoid,
     };
-    var data = JSON.stringify(json); //转换成json格式
-    wx.request({
-      url: url,
-      data: data,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+    //var data = JSON.stringify(json); //转换成json格式
+
+
+    getApp().request.promisePost(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         wx.hideLoading();
         if (res.data.code == 0) {
           getApp().my_warnning("评价成功", 1, th);
@@ -198,7 +195,7 @@ Page({
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
+
     })
  
   },
@@ -154,14 +154,11 @@ Page({
         };
         var data = JSON.stringify(json);
         var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-        wx.request({
-          url: url,
-          data: data,
-          method: 'put',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function(res) {
+
+
+        getApp().request.promisePut(url, {
+          data: json,is_json:1,is_normal:1
+        }).then(res => {
             if (res.data.code == 0) {
               getApp().my_warnning("取消成功", 1, th);
               var id = th.data.activeCategoryId;
@@ -180,7 +177,7 @@ Page({
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
             }
-          }
+
         })
       })
  
@@ -137,17 +137,13 @@ Page({
 			  req_arr.list.push(json);			 			 
 		}
 	}	
-	console.log(req_arr);	
+	//console.log(req_arr);
 	//return false;
-    var js_data = JSON.stringify(req_arr);
-    wx.request({
-      url: url,
-      data: js_data,
-      method: 'post',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+    //var js_data = JSON.stringify(req_arr);
+
+    getApp().request.promisePost(url, {
+          data: req_arr,is_json:1,is_normal:1
+    }).then(res => {
         th.setData({ is_sub: 0})
         wx.hideLoading();
         if (res.data.code == 0) {
@@ -170,7 +166,7 @@ Page({
           getApp().my_warnning(res.data.msg, 0, th);
           th.settime();
         }
-      }
+
     })
   },
  
@@ -170,14 +170,10 @@ Page({
       };
       var data = JSON.stringify(json);
       var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-      wx.request({
-        url: url,
-        data: data,
-        method: 'put',
-        header: {
-          'content-type': 'application/json'
-        }, // 设置请求的 header
-        success: function(res) {
+
+      getApp().request.promisePut(url, {
+        data: json,is_json:1,is_normal:1
+      }).then(res => {
           if (res.data.code == 0) {
             getApp().my_warnning(res.data.data, 1, th);
             setTimeout(function() {
@@ -189,7 +185,7 @@ Page({
           } else {
             getApp().my_warnning(res.data.msg, 0, th);
           }
-        }
+
       })
     } else {
       var pages = getCurrentPages(); //当前页面
@@ -374,20 +370,16 @@ Page({
     };
     var data = JSON.stringify(json);
     var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-    wx.request({
-      url: url,
-      data: data,
-      method: 'put',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+
+    getApp().request.promisePut(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         if (res.data.code == 0) {
           getApp().my_warnning("更改成功", 0, th);
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
+
     })
   },
   //预览头像
@@ -41,14 +41,9 @@ Page({
         };
         var data = JSON.stringify(json);
         var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-        wx.request({
-          url: url,
-          data: data,
-          method: 'put',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function(res) {
+        getApp().request.promisePut(url, {
+          data: json,is_json:1,is_normal:1
+        }).then(res => {
             my_confirm.open_cancel(0);
             if (res.data.code == 0) {
               getApp().my_warnning("取消成功", 1, th);
@@ -59,7 +54,7 @@ Page({
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
             }
-          }
+
         })
       }
     );
@@ -178,14 +178,10 @@ Page({
       "storeId": a.stoid,
     };
     var data = JSON.stringify(json); //转换成json格式
-    wx.request({
-      url: url,
-      data: data,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+
+    getApp().request.promisePost(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         wx.hideLoading();
         if (res.data.code == 0) {
           getApp().my_warnning("评价成功", 1, th);
@@ -198,7 +194,7 @@ Page({
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
+
     })
  
   },
@@ -154,14 +154,10 @@ Page({
         };
         var data = JSON.stringify(json);
         var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-        wx.request({
-          url: url,
-          data: data,
-          method: 'put',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function(res) {
+
+        getApp().request.promisePut(url, {
+          data: json,is_json:1,is_normal:1
+        }).then(res => {
             if (res.data.code == 0) {
               getApp().my_warnning("取消成功", 1, th);
               var id = th.data.activeCategoryId;
@@ -180,7 +176,7 @@ Page({
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
             }
-          }
+
         })
       })
  
@@ -426,20 +426,17 @@ Page({
     item.list.push(goods);
     pdata=item;
     if (pdata.length == 0) return false;
-    var str = JSON.stringify(pdata);
-    console.log(str,"----");
+    //var str = JSON.stringify(pdata);
+    //console.log(str,"----");
  
       wx.showLoading({
           title: "加载中"
       });
-      wx.request({
-          url: oo.url + '/api/weshop/recharge/saveRecharge',
-          data: str,
-          method: 'POST',
-          header: {
-              'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function(res) {
+
+      getApp().request.promisePost("/api/weshop/recharge/saveRecharge", {
+          data: pdata,is_json:1,is_normal:1
+      }).then(res => {
+
  
               wx.hideLoading();
               if (res.statusCode == 200) {
@@ -492,13 +489,10 @@ Page({
                   th.data.is_summit_ing = 0; //是否提交中
                   console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
               }
-          },
-          fail: function() {
-              th.data.is_summit_ing = 0; //是否提交中
-              wx.hideLoading();
-              console.log("index.js wx.request CheckCallUser fail");
-          },
-          complete: function() {}
+
+      }).catch(function(err) {
+            th.data.is_summit_ing = 0; //是否提交中
+            wx.hideLoading();
       })
  
   },
@@ -627,16 +627,11 @@ Page({
  
     var arr = [];
     arr.push(dd);
-    console.log(JSON.stringify(arr));
+    //console.log(JSON.stringify(arr));
  
-    wx.request({
-      url: oo.url + '/api/weshop/order/pay/payTuanWkCard',
-      data: JSON.stringify(arr),
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (t) {
+    getApp().request.promisePost("/api/weshop/order/pay/payTuanWkCard", {
+      data: arr,is_json:1,is_normal:1
+    }).then(t => {
  
         //---用微信支付---
         if (dd.tail_pay_type == 0) {
@@ -678,8 +673,12 @@ Page({
              getApp().my_warnning(t.data.msg, 1, th);
           }
         }
-      }
-    });
+
+    }).catch(function(err) {
+      th.data.paying=0;
+      wx.hideLoading();
+    })
+
   },
  
   //检查区域是不是包邮
@@ -199,6 +199,11 @@ Page({
       getApp().my_warnning("给点建议呗", 0, th);
       return false;
     }
+
+    if(this.data.lding) return false;
+    this.data.lding=1;
+
+
     wx.showLoading({
       title: '加载中',
     })
@@ -222,15 +227,12 @@ Page({
       "star": stars + 1,
       "storeId": a.stoid
     };
-    var data = JSON.stringify(json); //转换成json格式
-    wx.request({
-      url: url,
-      data: data,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+
+    //var data = JSON.stringify(json); //转换成json格式
+
+    getApp().request.promisePost(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         wx.hideLoading();
         if (res.data.code == 0) {
           getApp().my_warnning("评价成功", 1, th);
@@ -247,9 +249,13 @@ Page({
             });
           }, 2000);
         } else {
+          th.data.lding=0;
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
+
+    }).catch(function(err) {
+      th.data.lding=0;
+      wx.hideLoading();
     })
   },
  
@@ -2836,15 +2836,10 @@ Page({
         var str = JSON.stringify(pdata);
  
         wx.showLoading({ title: "加载中" });
-        wx.request({
-            url: oo.url + '/api/weshop/order/createWxdOrder',
-            data: str,
-            method: 'POST',
-            header: {
-                'content-type': 'application/json'
-            },// 设置请求的 header
-            success: function (res) {
  
+        getApp().request.promisePost("/api/weshop/order/createWxdOrder", {
+            data: pdata,is_json:1,is_normal:1
+        }).then(res => {
  
                 wx.hideLoading();
                 if (res.statusCode == 200) {
@@ -2951,14 +2946,11 @@ Page({
                     th.data.is_summit_ing = 0;  //是否提交中
                     console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
                 }
-            },
-            fail: function () {
-                th.data.is_summit_ing = 0;
-                wx.hideLoading();
-                console.log("index.js wx.request CheckCallUser fail");
-            },
-            complete: function () {
-            }
+
+        }).catch(function(err) {
+            th.data.is_summit_ing = 0;
+            wx.hideLoading();
+            console.log("index.js wx.request CheckCallUser fail");
         })
  
     },
@@ -1620,21 +1620,18 @@ Page({
       })
       // pdata.keyid = th.data.bn_goods.keyid
     }
-    var str = JSON.stringify(pdata);
-    console.log("支付数据");
-    console.log(str);
+
+    //var str = JSON.stringify(pdata);
+    //console.log("支付数据");
+    //console.log(str);
     //return false;
     wx.showLoading({
       title: "加载中"
     });
-    wx.request({
-      url: oo.url + '/api/weshop/order/createWxdOrder',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function (res) {
+
+    getApp().request.promisePost("/api/weshop/order/createWxdOrder", {
+      data: pdata,is_json:1,is_normal:1
+    }).then(res => {
  
         wx.hideLoading();
         if (res.statusCode == 200) {
@@ -1779,13 +1776,11 @@ Page({
           th.data.is_summit_ing = 0; //是否提交中
           console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
         }
-      },
-      fail: function () {
-        th.data.is_summit_ing = 0; //是否提交中	
-        wx.hideLoading();
-        console.log("index.js wx.request CheckCallUser fail");
-      },
-      complete: function () { }
+
+    }).catch(function(err) {
+      th.data.is_summit_ing = 0; //是否提交中
+      wx.hideLoading();
+      console.log("index.js wx.request CheckCallUser fail");
     })
   },
  
@@ -2512,15 +2512,10 @@ Page({
         var str = JSON.stringify(pdata);
  
         wx.showLoading({title: "加载中"});
-        wx.request({
-            url: oo.url + '/api/weshop/order/createWxdOrder',
-            data: str,
-            method: 'POST',
-            header: {
-                'content-type': 'application/json'
-            },// 设置请求的 header
-            success: function (res) {
  
+        getApp().request.promisePost("/api/weshop/order/createWxdOrder", {
+            data: pdata,is_json:1,is_normal:1
+        }).then(res => {
  
                 wx.hideLoading();
                 if (res.statusCode == 200) {
@@ -2627,16 +2622,14 @@ Page({
                     th.data.is_summit_ing = 0;  //是否提交中
                     console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
                 }
-            },
-            fail: function () {
-                th.data.is_summit_ing = 0;
-                wx.hideLoading();
-                console.log("index.js wx.request CheckCallUser fail");
-            },
-            complete: function () {
-            }
+
+        }).catch(function(err) {
+            th.data.is_summit_ing = 0;
+            wx.hideLoading();
+            console.log("index.js wx.request CheckCallUser fail");
         })
  
+
     },
     //---确认线下门店的数量足不足---
     async check_store_num(goods_id, pick, goods_num, func){
@@ -3183,14 +3183,11 @@ Page({
       dd.scene = getApp().globalData.scene;
  
     console.log(JSON.stringify(dd));
-    wx.request({
-      url: wk_url,
-      data: JSON.stringify(dd),
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (t) {
+
+    getApp().request.promisePost(wk_url, {
+      data: dd,is_json:1,is_normal:1
+    }).then(t => {
+
         th.close_show_pay();
  
         //---用微信支付---
@@ -3258,8 +3255,11 @@ Page({
           }
           th.data.paying = 0;
         }
-      }
-    });
+    }).catch(function(err) {
+      th.data.paying = 0;
+      wx.hideLoading();
+      th.updateOrderCoupon()
+    })
   },
  
   //------调起支付框--------
@@ -1381,21 +1381,17 @@ Page({
     item.list.push(goods);
  
     pdata = item;
-    var str = JSON.stringify(pdata);
-    console.log("支付数据");
-    console.log(str);
+    //var str = JSON.stringify(pdata);
+    //console.log("支付数据");
+    //console.log(str);
     //return false;
     wx.showLoading({
       title: "加载中"
     });
-    wx.request({
-      url: oo.url + '/api/weshop/recharge/saveRecharge',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function (res) {
+
+    getApp().request.promisePost("/api/weshop/recharge/saveRecharge", {
+      data: pdata,is_json:1,is_normal:1
+    }).then(res => {
  
         wx.hideLoading();
         if (res.statusCode == 200) {
@@ -1462,13 +1458,10 @@ Page({
           th.data.is_summit_ing = 0; //是否提交中
           console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
         }
-      },
-      fail: function () {
-        th.data.is_summit_ing = 0; //是否提交中
-        wx.hideLoading();
-        console.log("index.js wx.request CheckCallUser fail");
-      },
-      complete: function () { }
+
+    }).catch(function(err) {
+      th.data.is_summit_ing = 0; //是否提交中
+      wx.hideLoading();
     })
   },
  
@@ -2030,15 +2023,9 @@ Page({
     var str = JSON.stringify(pdata);
  
     wx.showLoading({ title: "加载中" });
-    wx.request({
-      url: oo.url + '/api/weshop/order/createWxdOrder',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (res) {
-
+    getApp().request.promisePost("/api/weshop/order/createWxdOrder", {
+      data: pdata,is_json:1,is_normal:1
+    }).then(res => {
  
         wx.hideLoading();
         if (res.statusCode == 200) {
@@ -2147,14 +2134,10 @@ Page({
           th.data.is_summit_ing = 0;  //是否提交中
           console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
         }
-      },
-      fail: function () {
-        th.data.is_summit_ing = 0;
-        wx.hideLoading();
-        console.log("index.js wx.request CheckCallUser fail");
-      },
-      complete: function () {
-      }
+
+    }).catch(function(err) {
+      th.data.is_summit_ing = 0;
+      wx.hideLoading();
     })
  
   },
@@ -947,21 +947,17 @@ Page({
     item.list.push(goods);
  
     pdata = item;
-    var str = JSON.stringify(pdata);
-    console.log("支付数据");
-    console.log(str);
+    //var str = JSON.stringify(pdata);
+    //console.log("支付数据");
+    //console.log(str);
     //return false;
     wx.showLoading({
       title: "加载中"
     });
-    wx.request({
-      url: os.url + '/api/weshop/recharge/saveRecharge',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+
+    getApp().request.promisePost("/api/weshop/recharge/saveRecharge", {
+      data: pdata,is_json:1,is_normal:1
+    }).then(res => {
  
         wx.hideLoading();
         if (res.statusCode == 200) {
@@ -1023,13 +1019,10 @@ Page({
           th.data.is_summit_ing = 0; //是否提交中
           console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
         }
-      },
-      fail: function() {
-        th.data.is_summit_ing = 0; //是否提交中
-        wx.hideLoading();
-        console.log("index.js wx.request CheckCallUser fail");
-      },
-      complete: function() {}
+
+    }).catch(function(err) {
+      th.data.is_summit_ing = 0; //是否提交中
+      wx.hideLoading();
     })
   },
  
@@ -1184,14 +1177,10 @@ Page({
  
     var str = JSON.stringify(pdata);
     wx.showLoading({ title: "加载中" });
-    wx.request({
-      url: os.url + '/api/weshop/order/createWxdOrder',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (res) {
+
+    getApp().request.promisePost("/api/weshop/order/createWxdOrder", {
+      data: pdata,is_json:1,is_normal:1
+    }).then(res => {
  
         wx.hideLoading();
         if (res.statusCode == 200) {
@@ -1267,13 +1256,9 @@ Page({
           th.data.is_summit_ing = 0;  //是否提交中
           console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
         }
-      },
-      fail: function () {
-        th.data.is_summit_ing = 0;  //是否提交中
-        wx.hideLoading();
-        console.log("index.js wx.request CheckCallUser fail");
-      },
-      complete: function () { }
+    }).catch(function(err) {
+      th.data.is_summit_ing = 0;  //是否提交中
+      wx.hideLoading();
     })
   },
   //订阅消息提醒
@@ -674,17 +674,44 @@ Page({
     json_post: function (url, data, succ, fail, mathod) {
         var Mathod = "POST";
         if (mathod) Mathod = mathod;
+
+        var url1=url;
+        var arr_in_url=ut.getParams(url1);
+
         if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
-        var str = JSON.stringify(data);
-        wx.request({
-            url: url,
-            data: str,
-            method: Mathod,
-            header: {
+
+        getApp().request.ck_api_token((api_tk)=> {
+
+            var header={
                 'content-type': 'application/json'
-            },// 设置请求的 header
-            success: function (res) { succ(res); },
-            fail: function (res) { fail(res); }
+            };// 设置请求的 header
+
+            var dd= ut.deep_cp(data);
+            dd={...arr_in_url,...dd};
+
+            var now=ut.gettimestamp();
+            var tk=getApp().request.set_req_sign(dd,url1,now,api_tk,1);
+            if(tk){
+                header.reqtime=now;
+                header.token=tk;
+                header.ukey=api_tk.userkey
+            }
+
+
+            var str = JSON.stringify(data);
+            wx.request({
+                url: url,
+                data: str,
+                method: Mathod,
+                header:header,// 设置请求的 header
+                success: function (res) {
+                    succ(res);
+                },
+                fail: function (res) {
+                    fail(res);
+                }
+            })
         })
     },
+
 })
 \ No newline at end of file
@@ -198,19 +198,46 @@ Page({
     json_post: function (url, data, succ, fail, mathod) {
         var Mathod = "POST";
         if (mathod) Mathod = mathod;
+
+        var url1=url;
+        var arr_in_url=ut.getParams(url1);
+
         if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
-        var str = JSON.stringify(data);
-        wx.request({
-            url: url,
-            data: str,
-            method: Mathod,
-            header: {
+
+        getApp().request.ck_api_token((api_tk)=> {
+
+            var header={
                 'content-type': 'application/json'
-            },// 设置请求的 header
-            success: function (res) { succ(res); },
-            fail: function (res) { fail(res); }
+            };// 设置请求的 header
+
+            var dd= ut.deep_cp(data);
+            dd={...arr_in_url,...dd};
+
+            var now=ut.gettimestamp();
+            var tk=getApp().request.set_req_sign(dd,url1,now,api_tk,1);
+            if(tk){
+                header.reqtime=now;
+                header.token=tk;
+                header.ukey=api_tk.userkey
+            }
+
+
+            var str = JSON.stringify(data);
+            wx.request({
+                url: url,
+                data: str,
+                method: Mathod,
+                header:header,// 设置请求的 header
+                success: function (res) {
+                    succ(res);
+                },
+                fail: function (res) {
+                    fail(res);
+                }
+            })
         })
     },
  
  
+
 })
 \ No newline at end of file
@@ -264,17 +264,44 @@ Page({
     json_post: function (url, data, succ, fail, mathod) {
         var Mathod = "POST";
         if (mathod) Mathod = mathod;
+
+        var url1=url;
+        var arr_in_url=ut.getParams(url1);
+
         if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
-        var str = JSON.stringify(data);
-        wx.request({
-            url: url,
-            data: str,
-            method: Mathod,
-            header: {
+
+        getApp().request.ck_api_token((api_tk)=> {
+
+            var header={
                 'content-type': 'application/json'
-            },// 设置请求的 header
-            success: function (res) { succ(res); },
-            fail: function (res) { fail(res); }
+            };// 设置请求的 header
+
+            var dd= ut.deep_cp(data);
+            dd={...arr_in_url,...dd};
+
+            var now=ut.gettimestamp();
+            var tk=getApp().request.set_req_sign(dd,url1,now,api_tk,1);
+            if(tk){
+                header.reqtime=now;
+                header.token=tk;
+                header.ukey=api_tk.userkey
+            }
+
+
+            var str = JSON.stringify(data);
+            wx.request({
+                url: url,
+                data: str,
+                method: Mathod,
+                header:header,// 设置请求的 header
+                success: function (res) {
+                    succ(res);
+                },
+                fail: function (res) {
+                    fail(res);
+                }
+            })
         })
     },
+
 })
 \ No newline at end of file
@@ -291,17 +291,44 @@ Page({
     json_post: function (url, data, succ, fail, mathod) {
         var Mathod = "POST";
         if (mathod) Mathod = mathod;
+
+        var url1=url;
+        var arr_in_url=ut.getParams(url1);
+
         if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
-        var str = JSON.stringify(data);
-        wx.request({
-            url: url,
-            data: str,
-            method: Mathod,
-            header: {
+
+        getApp().request.ck_api_token((api_tk)=> {
+
+            var header={
                 'content-type': 'application/json'
-            },// 设置请求的 header
-            success: function (res) { succ(res); },
-            fail: function (res) { fail(res); }
+            };// 设置请求的 header
+
+            var dd= ut.deep_cp(data);
+            dd={...arr_in_url,...dd};
+
+            var now=ut.gettimestamp();
+            var tk=getApp().request.set_req_sign(dd,url1,now,api_tk,1);
+            if(tk){
+                header.reqtime=now;
+                header.token=tk;
+                header.ukey=api_tk.userkey
+            }
+
+
+            var str = JSON.stringify(data);
+            wx.request({
+                url: url,
+                data: str,
+                method: Mathod,
+                header:header,// 设置请求的 header
+                success: function (res) {
+                    succ(res);
+                },
+                fail: function (res) {
+                    fail(res);
+                }
+            })
         })
     },
+
 })
 \ No newline at end of file
@@ -213,16 +213,11 @@ Page({
     delete user_infor.type;
  
     user_infor.source_type=1;
-    var str = JSON.stringify(user_infor);
+    //var str = JSON.stringify(user_infor);
     // wx.showLoading({ title: "加载中" });
-    wx.request({
-      url: oo.url + '/api/weshop/users/saveWithdrawals',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+    getApp().request.promisePost("/api/weshop/users/saveWithdrawals", {
+      data: user_infor,is_json:1,is_normal:1
+    }).then(res => {
  
         th.data.tx_ing=0;
         if (res.data.code != -1) {
@@ -232,12 +227,10 @@ Page({
         } else {
           getApp().showWarning("提现金额不足");
         }
-      },
-      fail: function() {
-        getApp().showWarning("出现错误");
-      },
-
  
+    }).catch(function(err) {
+      getApp().showWarning("网络繁忙，请稍后重试");
+      th.data.tx_ing=0;
     })
  
   },
@@ -6005,14 +6005,10 @@ Page({
  
     wx.showLoading({ title: "加载中" });
     th.setData({ submit: 1, })
-    wx.request({
-      url: oo.url + '/api/weshop/order/createWxdOrder',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (res) {
+
+    getApp().request.promisePost("/api/weshop/order/createWxdOrder", {
+      data: pdata,is_json:1,is_normal:1
+    }).then(res => {
         wx.hideLoading();
  
         if (res.statusCode == 200) {
@@ -6178,17 +6174,17 @@ Page({
             submit: 0,
           })
         }
-      },
-      fail: function () {
-        th.data.is_summit_ing = 0;
-        wx.hideLoading();
-        console.log("index.js wx.request CheckCallUser fail");
-        th.setData({
-          submit: 0,
-        })
-      }
+
+    }).catch(function(err) {
+      th.data.is_summit_ing = 0;
+      wx.hideLoading();
+      console.log("index.js wx.request CheckCallUser fail");
+      th.setData({
+        submit: 0,
+      })
     })
  
+
   },
   //看一下有没有选择搭配的商品
   has_collocation(goods, prom_id) {
@@ -1478,14 +1478,11 @@ Page({
     var str = JSON.stringify(pdata);
  
     wx.showLoading({ title: "加载中" });
-    wx.request({
-      url: oo.url + '/api/weshop/order/createWxdOrder',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (res) {
+
+
+    getApp().request.promisePost("/api/weshop/order/createWxdOrder", {
+      data: pdata,is_json:1,is_normal:1
+    }).then(res => {
         wx.hideLoading();
         if (res.statusCode == 200) {
           var data = res.data;
@@ -1587,14 +1584,11 @@ Page({
             th.data.is_summit_ing = 0;  //是否提交中
             console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
         }
-      },
-      fail: function () {
-        th.setData({submit:0})
-        th.data.is_summit_ing = 0;
-        wx.hideLoading();
-        console.log("index.js wx.request CheckCallUser fail");
-      },
-      complete: function () { }
+
+    }).catch(function(err) {
+      th.setData({ submit: 0 })
+      th.data.is_summit_ing = 0;
+      wx.hideLoading();
     })
  
   },
@@ -1664,14 +1664,11 @@ Page({
     console.log(str);
     //return false;
     wx.showLoading({ title: "加载中" });
-    wx.request({
-      url: oo.url + '/api/weshop/order/createWxdOrder',
-      data: str,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (res) {
+
+
+    getApp().request.promisePost("/api/weshop/order/createWxdOrder", {
+      data: pdata,is_json:1,is_normal:1
+    }).then(res => {
  
         wx.hideLoading();
         if (res.statusCode == 200) {
@@ -1767,14 +1764,10 @@ Page({
           th.data.is_summit_ing = 0;  //是否提交中
           console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
         }
-      },
-      fail: function () {
-        th.data.is_summit_ing = 0;  //是否提交中
-        wx.hideLoading();
-        console.log("index.js wx.request CheckCallUser fail");
-      },
-      complete: function () {
-      }
+
+    }).catch(function(err) {
+      th.data.is_summit_ing = 0;  //是否提交中
+      wx.hideLoading();
     })
   },
   useCoupon: function () {
@@ -783,15 +783,11 @@ Page({
  
     var arr = [];
     arr.push(dd);
-    console.log(JSON.stringify(arr));
-    wx.request({
-      url: oo.url + '/api/weshop/order/pay/payTuanWk',
-      data: JSON.stringify(arr),
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (t) {
+    //console.log(JSON.stringify(arr));
+
+    getApp().request.promisePost("/api/weshop/order/pay/payTuanWk", {
+      data: arr,is_json:1,is_normal:1
+    }).then(t => {
  
         //---用微信支付---
         if (dd.tail_pay_type == 0) {
@@ -840,13 +836,13 @@ Page({
               })
             }, 1000)
           } else {
-
              th.data.paying=0;
              getApp().my_warnning(t.data.msg, 1, th);
           }
         }
-      }
-    });
+    }).catch(function(err) {
+      th.data.paying=0;
+    })
   },
  
   //检查区域是不是包邮
@@ -43,19 +43,29 @@ Page({
       title: '加载中',
     })
     var url = "/api/weshop/marketing/giftbag/bound/get";
+
+    var data={
+      "actId": th.data.getActId, //活动Id
+      "actType": 2, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+      "storeId": a.stoid, //商家Id
+      "userId": d.user_id, //用户ID
+      "orderNumber": th.data.orderNumber,
+      "orderType": th.data.orderType,
+      "isdg": th.data.isdg
+    };
+
+    if(th.data.orderGoodsId){
+      data["orderGoodsId"]=th.data.orderGoodsId;
+    }
+
+    if(th.data.giftBagId){
+      data["gifbagid"]= th.data.giftBagId;
+    }
+
+
     getApp().request.promiseGet(url, {
       isShowLoading: true,
-      data: {
-        "actId": th.data.getActId, //活动Id
-        "actType": 2, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-        "storeId": a.stoid, //商家Id
-        "userId": d.user_id, //用户ID
-        "orderNumber": th.data.orderNumber,
-        "orderType": th.data.orderType,
-        "orderGoodsId": th.data.orderGoodsId,
-        "gifbagid": th.data.giftBagId,
-        "isdg": th.data.isdg
-      }
+      data:data
     }).then(res => {
       if (res.data.code == 0) {
         if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons != null) {
@@ -190,10 +200,18 @@ Page({
         "userId": d.user_id, //用户ID
         "orderNumber": th.data.orderNumber,
         "orderType": th.data.orderType,
-        "orderGoodsId": th.data.orderGoodsId,
-        "giftBagId": th.data.giftBagId,
         "buyFrom": 2
       };
+
+      if(th.data.orderGoodsId){
+          json.orderGoodsId=th.data.orderGoodsId;
+      }
+
+      if(th.data.giftBagId){
+        json.giftBagId=th.data.giftBagId
+      }
+
+
       if (th.data.isdg) {
         json.isdg=th.data.isdg
       }
@@ -25,17 +25,17 @@ Page({
     },
     requestExpress: function() {
         var s = this;
-        wx.request({
-             url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no + "/" + this.data.delivery.mobile,                 success: function(e) {
-                
+
+        var url="/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no + "/" + this.data.delivery.mobile;
+
+        getApp().request.promiseGet(url, {}).then(e => {
                var re_arr = e.data.data.Traces.reverse();
                 s.setData({
                   express: e.data.data, re_arr: re_arr,
                 });
-            },
-            fail: function(s) {
-                e.showWarning("请求失败");
-            }
-        });
+
+        }).catch(function(err) {
+            e.showWarning("请求失败");
+        })
     }
 });
 \ No newline at end of file
@@ -116,14 +116,10 @@ Page({
       "validay": validay
     }
     var data = JSON.stringify(json);
-    wx.request({
-      url: url,
-      data: json,
-      method: 'post',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+
+    getApp().request.promisePost(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         th.setData({
           is_sub: 0
         })
@@ -132,7 +128,7 @@ Page({
           getApp().my_warnning("预约成功", 1, th);
           var store_name = th.data.store_name; //预约门店
           var number = res.data.data.Number;
-          var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口     
+          var temp_url = "/api/weshop/wx/open/app/user/sendSubscribeMsg"; //模版接口
           var userinfo = getApp().globalData.userInfo;
           var name = d.userInfo.nickname;
           var json = {
@@ -156,16 +152,12 @@ Page({
             "userId": d.user_id
           };
           var data = JSON.stringify(json);
-          //调用发送预约成功模版接口
-          wx.request({
-            url: th.data.inurl + temp_url,
-            data: data,
-            method: 'post',
-            header: {
-              'content-type': 'application/json'
-            }, // 设置请求的 header
-            success: function(data) {}
-          })
+
+          getApp().request.promisePost(temp_url, {
+            data: json, is_json: 1, is_normal: 1
+          }).then( r =>{})
+
+
           setTimeout(function() {
             wx.redirectTo({
               url: "/packageG/pages/user/my_service/tment_details?number=" + number
@@ -175,7 +167,7 @@ Page({
           getApp().my_warnning(res.data.msg, 0, th);
           th.settime();
         }
-      }
+
     })
  
   },
@@ -167,14 +167,10 @@ Page({
       };
       var data = JSON.stringify(json);
       var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-      wx.request({
-        url: url,
-        data: data,
-        method: 'put',
-        header: {
-          'content-type': 'application/json'
-        }, // 设置请求的 header
-        success: function (res) {
+
+      getApp().request.promisePut(url, {
+        data: json,is_json:1,is_normal:1
+      }).then(res => {
           if (res.data.code == 0) {
             getApp().my_warnning(res.data.data, 1, th);
             setTimeout(function () {
@@ -186,7 +182,7 @@ Page({
           } else {
             getApp().my_warnning(res.data.msg, 0, th);
           }
-        }
+
       })
     } else {
       var pages = getCurrentPages(); //当前页面
@@ -373,20 +369,16 @@ Page({
     };
     var data = JSON.stringify(json);
     var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-    wx.request({
-      url: url,
-      data: data,
-      method: 'put',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function (res) {
+
+    getApp().request.promisePut(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         if (res.data.code == 0) {
           getApp().my_warnning("更改成功", 0, th);
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
+
     })
   },
   //预览头像
@@ -40,14 +40,9 @@ Page({
         };
         var data = JSON.stringify(json);
         var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-        wx.request({
-          url: url,
-          data: data,
-          method: 'put',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function(res) {
+        getApp().request.promisePut(url, {
+          data: json,is_json:1,is_normal:1
+        }).then(res => {
             my_confirm.open_cancel(0);
             if (res.data.code == 0) {
               getApp().my_warnning("取消成功", 1, th);
@@ -58,7 +53,7 @@ Page({
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
             }
-          }
+
         })
       }
     );
@@ -178,14 +178,10 @@ Page({
       "storeId": a.stoid
     };
     var data = JSON.stringify(json); //转换成json格式
-    wx.request({
-      url: url,
-      data: data,
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+
+    getApp().request.promisePost(url, {
+      data: json,is_json:1,is_normal:1
+    }).then(res => {
         wx.hideLoading();
         if (res.data.code == 0) {
           getApp().my_warnning("评价成功", 1, th);
@@ -198,7 +194,7 @@ Page({
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
+
     })
  
   },
@@ -151,14 +151,10 @@ Page({
         };
         var data = JSON.stringify(json);
         var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-        wx.request({
-          url: url,
-          data: data,
-          method: 'put',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function(res) {
+
+        getApp().request.promisePut(url, {
+          data: json,is_json:1,is_normal:1
+        }).then(res => {
             if (res.data.code == 0) {
               getApp().my_warnning("取消成功", 1, th);
               var id = th.data.activeCategoryId;
@@ -177,7 +173,7 @@ Page({
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
             }
-          }
+
         })
       })
  
+/**
+ * [js-md5]{@link https://github.com/emn178/js-md5}
+ *
+ * @namespace md5
+ * @version 0.7.3
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2017
+ * @license MIT
+ */
+!function(){"use strict";function t(t){if(t)d[0]=d[16]=d[1]=d[2]=d[3]=d[4]=d[5]=d[6]=d[7]=d[8]=d[9]=d[10]=d[11]=d[12]=d[13]=d[14]=d[15]=0,this.blocks=d,this.buffer8=l;else if(a){var r=new ArrayBuffer(68);this.buffer8=new Uint8Array(r),this.blocks=new Uint32Array(r)}else this.blocks=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];this.h0=this.h1=this.h2=this.h3=this.start=this.bytes=this.hBytes=0,this.finalized=this.hashed=!1,this.first=!0}var r="input is invalid type",e="object"==typeof window,i=e?window:{};i.JS_MD5_NO_WINDOW&&(e=!1);var s=!e&&"object"==typeof self,h=!i.JS_MD5_NO_NODE_JS&&"object"==typeof process&&process.versions&&process.versions.node;h?i=global:s&&(i=self);var f=!i.JS_MD5_NO_COMMON_JS&&"object"==typeof module&&module.exports,o="function"==typeof define&&define.amd,a=!i.JS_MD5_NO_ARRAY_BUFFER&&"undefined"!=typeof ArrayBuffer,n="0123456789abcdef".split(""),u=[128,32768,8388608,-2147483648],y=[0,8,16,24],c=["hex","array","digest","buffer","arrayBuffer","base64"],p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""),d=[],l;if(a){var A=new ArrayBuffer(68);l=new Uint8Array(A),d=new Uint32Array(A)}!i.JS_MD5_NO_NODE_JS&&Array.isArray||(Array.isArray=function(t){return"[object Array]"===Object.prototype.toString.call(t)}),!a||!i.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW&&ArrayBuffer.isView||(ArrayBuffer.isView=function(t){return"object"==typeof t&&t.buffer&&t.buffer.constructor===ArrayBuffer});var b=function(r){return function(e){return new t(!0).update(e)[r]()}},v=function(){var r=b("hex");h&&(r=w(r)),r.create=function(){return new t},r.update=function(t){return r.create().update(t)};for(var e=0;e<c.length;++e){var i=c[e];r[i]=b(i)}return r},w=function(t){var e=eval("require('crypto')"),i=eval("require('buffer').Buffer"),s=function(s){if("string"==typeof s)return e.createHash("md5").update(s,"utf8").digest("hex");if(null===s||void 0===s)throw r;return s.constructor===ArrayBuffer&&(s=new Uint8Array(s)),Array.isArray(s)||ArrayBuffer.isView(s)||s.constructor===i?e.createHash("md5").update(new i(s)).digest("hex"):t(s)};return s};t.prototype.update=function(t){if(!this.finalized){var e,i=typeof t;if("string"!==i){if("object"!==i)throw r;if(null===t)throw r;if(a&&t.constructor===ArrayBuffer)t=new Uint8Array(t);else if(!(Array.isArray(t)||a&&ArrayBuffer.isView(t)))throw r;e=!0}for(var s,h,f=0,o=t.length,n=this.blocks,u=this.buffer8;f<o;){if(this.hashed&&(this.hashed=!1,n[0]=n[16],n[16]=n[1]=n[2]=n[3]=n[4]=n[5]=n[6]=n[7]=n[8]=n[9]=n[10]=n[11]=n[12]=n[13]=n[14]=n[15]=0),e)if(a)for(h=this.start;f<o&&h<64;++f)u[h++]=t[f];else for(h=this.start;f<o&&h<64;++f)n[h>>2]|=t[f]<<y[3&h++];else if(a)for(h=this.start;f<o&&h<64;++f)(s=t.charCodeAt(f))<128?u[h++]=s:s<2048?(u[h++]=192|s>>6,u[h++]=128|63&s):s<55296||s>=57344?(u[h++]=224|s>>12,u[h++]=128|s>>6&63,u[h++]=128|63&s):(s=65536+((1023&s)<<10|1023&t.charCodeAt(++f)),u[h++]=240|s>>18,u[h++]=128|s>>12&63,u[h++]=128|s>>6&63,u[h++]=128|63&s);else for(h=this.start;f<o&&h<64;++f)(s=t.charCodeAt(f))<128?n[h>>2]|=s<<y[3&h++]:s<2048?(n[h>>2]|=(192|s>>6)<<y[3&h++],n[h>>2]|=(128|63&s)<<y[3&h++]):s<55296||s>=57344?(n[h>>2]|=(224|s>>12)<<y[3&h++],n[h>>2]|=(128|s>>6&63)<<y[3&h++],n[h>>2]|=(128|63&s)<<y[3&h++]):(s=65536+((1023&s)<<10|1023&t.charCodeAt(++f)),n[h>>2]|=(240|s>>18)<<y[3&h++],n[h>>2]|=(128|s>>12&63)<<y[3&h++],n[h>>2]|=(128|s>>6&63)<<y[3&h++],n[h>>2]|=(128|63&s)<<y[3&h++]);this.lastByteIndex=h,this.bytes+=h-this.start,h>=64?(this.start=h-64,this.hash(),this.hashed=!0):this.start=h}return this.bytes>4294967295&&(this.hBytes+=this.bytes/4294967296<<0,this.bytes=this.bytes%4294967296),this}},t.prototype.finalize=function(){if(!this.finalized){this.finalized=!0;var t=this.blocks,r=this.lastByteIndex;t[r>>2]|=u[3&r],r>=56&&(this.hashed||this.hash(),t[0]=t[16],t[16]=t[1]=t[2]=t[3]=t[4]=t[5]=t[6]=t[7]=t[8]=t[9]=t[10]=t[11]=t[12]=t[13]=t[14]=t[15]=0),t[14]=this.bytes<<3,t[15]=this.hBytes<<3|this.bytes>>>29,this.hash()}},t.prototype.hash=function(){var t,r,e,i,s,h,f=this.blocks;this.first?r=((r=((t=((t=f[0]-680876937)<<7|t>>>25)-271733879<<0)^(e=((e=(-271733879^(i=((i=(-1732584194^2004318071&t)+f[1]-117830708)<<12|i>>>20)+t<<0)&(-271733879^t))+f[2]-1126478375)<<17|e>>>15)+i<<0)&(i^t))+f[3]-1316259209)<<22|r>>>10)+e<<0:(t=this.h0,r=this.h1,e=this.h2,r=((r+=((t=((t+=((i=this.h3)^r&(e^i))+f[0]-680876936)<<7|t>>>25)+r<<0)^(e=((e+=(r^(i=((i+=(e^t&(r^e))+f[1]-389564586)<<12|i>>>20)+t<<0)&(t^r))+f[2]+606105819)<<17|e>>>15)+i<<0)&(i^t))+f[3]-1044525330)<<22|r>>>10)+e<<0),r=((r+=((t=((t+=(i^r&(e^i))+f[4]-176418897)<<7|t>>>25)+r<<0)^(e=((e+=(r^(i=((i+=(e^t&(r^e))+f[5]+1200080426)<<12|i>>>20)+t<<0)&(t^r))+f[6]-1473231341)<<17|e>>>15)+i<<0)&(i^t))+f[7]-45705983)<<22|r>>>10)+e<<0,r=((r+=((t=((t+=(i^r&(e^i))+f[8]+1770035416)<<7|t>>>25)+r<<0)^(e=((e+=(r^(i=((i+=(e^t&(r^e))+f[9]-1958414417)<<12|i>>>20)+t<<0)&(t^r))+f[10]-42063)<<17|e>>>15)+i<<0)&(i^t))+f[11]-1990404162)<<22|r>>>10)+e<<0,r=((r+=((t=((t+=(i^r&(e^i))+f[12]+1804603682)<<7|t>>>25)+r<<0)^(e=((e+=(r^(i=((i+=(e^t&(r^e))+f[13]-40341101)<<12|i>>>20)+t<<0)&(t^r))+f[14]-1502002290)<<17|e>>>15)+i<<0)&(i^t))+f[15]+1236535329)<<22|r>>>10)+e<<0,r=((r+=((i=((i+=(r^e&((t=((t+=(e^i&(r^e))+f[1]-165796510)<<5|t>>>27)+r<<0)^r))+f[6]-1069501632)<<9|i>>>23)+t<<0)^t&((e=((e+=(t^r&(i^t))+f[11]+643717713)<<14|e>>>18)+i<<0)^i))+f[0]-373897302)<<20|r>>>12)+e<<0,r=((r+=((i=((i+=(r^e&((t=((t+=(e^i&(r^e))+f[5]-701558691)<<5|t>>>27)+r<<0)^r))+f[10]+38016083)<<9|i>>>23)+t<<0)^t&((e=((e+=(t^r&(i^t))+f[15]-660478335)<<14|e>>>18)+i<<0)^i))+f[4]-405537848)<<20|r>>>12)+e<<0,r=((r+=((i=((i+=(r^e&((t=((t+=(e^i&(r^e))+f[9]+568446438)<<5|t>>>27)+r<<0)^r))+f[14]-1019803690)<<9|i>>>23)+t<<0)^t&((e=((e+=(t^r&(i^t))+f[3]-187363961)<<14|e>>>18)+i<<0)^i))+f[8]+1163531501)<<20|r>>>12)+e<<0,r=((r+=((i=((i+=(r^e&((t=((t+=(e^i&(r^e))+f[13]-1444681467)<<5|t>>>27)+r<<0)^r))+f[2]-51403784)<<9|i>>>23)+t<<0)^t&((e=((e+=(t^r&(i^t))+f[7]+1735328473)<<14|e>>>18)+i<<0)^i))+f[12]-1926607734)<<20|r>>>12)+e<<0,r=((r+=((h=(i=((i+=((s=r^e)^(t=((t+=(s^i)+f[5]-378558)<<4|t>>>28)+r<<0))+f[8]-2022574463)<<11|i>>>21)+t<<0)^t)^(e=((e+=(h^r)+f[11]+1839030562)<<16|e>>>16)+i<<0))+f[14]-35309556)<<23|r>>>9)+e<<0,r=((r+=((h=(i=((i+=((s=r^e)^(t=((t+=(s^i)+f[1]-1530992060)<<4|t>>>28)+r<<0))+f[4]+1272893353)<<11|i>>>21)+t<<0)^t)^(e=((e+=(h^r)+f[7]-155497632)<<16|e>>>16)+i<<0))+f[10]-1094730640)<<23|r>>>9)+e<<0,r=((r+=((h=(i=((i+=((s=r^e)^(t=((t+=(s^i)+f[13]+681279174)<<4|t>>>28)+r<<0))+f[0]-358537222)<<11|i>>>21)+t<<0)^t)^(e=((e+=(h^r)+f[3]-722521979)<<16|e>>>16)+i<<0))+f[6]+76029189)<<23|r>>>9)+e<<0,r=((r+=((h=(i=((i+=((s=r^e)^(t=((t+=(s^i)+f[9]-640364487)<<4|t>>>28)+r<<0))+f[12]-421815835)<<11|i>>>21)+t<<0)^t)^(e=((e+=(h^r)+f[15]+530742520)<<16|e>>>16)+i<<0))+f[2]-995338651)<<23|r>>>9)+e<<0,r=((r+=((i=((i+=(r^((t=((t+=(e^(r|~i))+f[0]-198630844)<<6|t>>>26)+r<<0)|~e))+f[7]+1126891415)<<10|i>>>22)+t<<0)^((e=((e+=(t^(i|~r))+f[14]-1416354905)<<15|e>>>17)+i<<0)|~t))+f[5]-57434055)<<21|r>>>11)+e<<0,r=((r+=((i=((i+=(r^((t=((t+=(e^(r|~i))+f[12]+1700485571)<<6|t>>>26)+r<<0)|~e))+f[3]-1894986606)<<10|i>>>22)+t<<0)^((e=((e+=(t^(i|~r))+f[10]-1051523)<<15|e>>>17)+i<<0)|~t))+f[1]-2054922799)<<21|r>>>11)+e<<0,r=((r+=((i=((i+=(r^((t=((t+=(e^(r|~i))+f[8]+1873313359)<<6|t>>>26)+r<<0)|~e))+f[15]-30611744)<<10|i>>>22)+t<<0)^((e=((e+=(t^(i|~r))+f[6]-1560198380)<<15|e>>>17)+i<<0)|~t))+f[13]+1309151649)<<21|r>>>11)+e<<0,r=((r+=((i=((i+=(r^((t=((t+=(e^(r|~i))+f[4]-145523070)<<6|t>>>26)+r<<0)|~e))+f[11]-1120210379)<<10|i>>>22)+t<<0)^((e=((e+=(t^(i|~r))+f[2]+718787259)<<15|e>>>17)+i<<0)|~t))+f[9]-343485551)<<21|r>>>11)+e<<0,this.first?(this.h0=t+1732584193<<0,this.h1=r-271733879<<0,this.h2=e-1732584194<<0,this.h3=i+271733878<<0,this.first=!1):(this.h0=this.h0+t<<0,this.h1=this.h1+r<<0,this.h2=this.h2+e<<0,this.h3=this.h3+i<<0)},t.prototype.hex=function(){this.finalize();var t=this.h0,r=this.h1,e=this.h2,i=this.h3;return n[t>>4&15]+n[15&t]+n[t>>12&15]+n[t>>8&15]+n[t>>20&15]+n[t>>16&15]+n[t>>28&15]+n[t>>24&15]+n[r>>4&15]+n[15&r]+n[r>>12&15]+n[r>>8&15]+n[r>>20&15]+n[r>>16&15]+n[r>>28&15]+n[r>>24&15]+n[e>>4&15]+n[15&e]+n[e>>12&15]+n[e>>8&15]+n[e>>20&15]+n[e>>16&15]+n[e>>28&15]+n[e>>24&15]+n[i>>4&15]+n[15&i]+n[i>>12&15]+n[i>>8&15]+n[i>>20&15]+n[i>>16&15]+n[i>>28&15]+n[i>>24&15]},t.prototype.toString=t.prototype.hex,t.prototype.digest=function(){this.finalize();var t=this.h0,r=this.h1,e=this.h2,i=this.h3;return[255&t,t>>8&255,t>>16&255,t>>24&255,255&r,r>>8&255,r>>16&255,r>>24&255,255&e,e>>8&255,e>>16&255,e>>24&255,255&i,i>>8&255,i>>16&255,i>>24&255]},t.prototype.array=t.prototype.digest,t.prototype.arrayBuffer=function(){this.finalize();var t=new ArrayBuffer(16),r=new Uint32Array(t);return r[0]=this.h0,r[1]=this.h1,r[2]=this.h2,r[3]=this.h3,t},t.prototype.buffer=t.prototype.arrayBuffer,t.prototype.base64=function(){for(var t,r,e,i="",s=this.array(),h=0;h<15;)t=s[h++],r=s[h++],e=s[h++],i+=p[t>>>2]+p[63&(t<<4|r>>>4)]+p[63&(r<<2|e>>>6)]+p[63&e];return t=s[h],i+=p[t>>>2]+p[t<<4&63]+"=="};var _=v();f?module.exports=_:(i.md5=_,o&&define(function(){return _}))}();
 \ No newline at end of file
 var t = require("util.js");
+var md5 = require("md5.min.js");
+var setting = require("../setting.js");
+var ut=t;
  
 module.exports = {
   uniqueId: "",
@@ -7,35 +10,59 @@ module.exports = {
   // s: data
   // a: header
   request: function (e, i, o, delay = 1000) {
+
+    var arr_in_url=t.getParams(i);
     this.check_timeout(i, delay, () => {
       var n = this, a = o.header ? o.header : {
         "content-type": "application/x-www-form-urlencoded"
         //"content-type": "application/texts"         
-      }, s = "GET" != (e = e.toUpperCase()) && o.data ? t.json2Form(o.data) : o.data;
-      i = this.modifyUrl(i, o),
+      };
+
+      //-- 获取一下token --
+      this.ck_api_token((api_tk)=>{
+
+        console.log("--- api_tk ---");
+        var dd= t.deep_cp(o.data);
+        var new_data={...arr_in_url,...dd};
+
+        var now=t.gettimestamp();
+        var tk=this.set_req_sign(new_data,i,now,api_tk);
+        if(tk){
+           a.reqtime=now;
+           a.token=tk;
+           a.ukey=api_tk.userkey
+        }
+
+        var s = "GET" != (e = e.toUpperCase()) && o.data ? t.json2Form(o.data) : o.data;
+        i = this.modifyUrl(i, o),
         o.isShowLoading && this.showLoading();
-      var req = wx.request(Object.assign({}, o, {
-        url: i,
-        method: e,
-        data: s,
-        header: a,
-        success: function (t) {
-          o.isShowLoading && n.hideLoading(), n.doSuccess(o, t);
-        },
-        fail(err) {
-          o.isShowLoading && n.hideLoading();
-          if (err && err.errMsg && err.errMsg.indexOf('timeout') != -1) {
-            getApp().globalData.fail_url.set(t.gettimestamp(), i);
-            console.log('请求超时url---', getApp().globalData.fail_url);
-            n.doTimeOut(o, t);
-          } else {
-            n.doFail(o, t);
+
+        var req = wx.request(Object.assign({}, o, {
+          url: i,
+          method: e,
+          data: s,
+          header: a,
+          success: function (t) {
+            o.isShowLoading && n.hideLoading(), n.doSuccess(o, t);
+          },
+          fail(err) {
+            o.isShowLoading && n.hideLoading();
+            if (err && err.errMsg && err.errMsg.indexOf('timeout') != -1) {
+              getApp().globalData.fail_url.set(t.gettimestamp(), i);
+              console.log('请求超时url---', getApp().globalData.fail_url);
+              n.doTimeOut(o, t);
+            } else {
+              n.doFail(o, t);
+            }
           }
-        }
-      }));
-      return req;
+        }));
+        return req;
+      })
+
+
     })
   },
+
   get: function (t, e) {
     console.log(t, e);
     return this.request("GET", t, e);
@@ -153,24 +180,41 @@ module.exports = {
     });
   },
  
+  
   request2: function (e, i, o) {
+
     var n = this, a = o.header ? o.header : {
       "content-type": "application/x-www-form-urlencoded"
     }, s = "GET" != (e = e.toUpperCase()) && o.data ? t.json2Form(o.data) : o.data;
-    i = this.modifyUrl2(i, o), o.isShowLoading = void 0 === o.isShowLoading || o.isShowLoading,
-      o.isShowLoading && this.showLoading(), console.log("app.request", i, o), wx.request(Object.assign({}, o, {
-        url: i,
-        method: e,
-        data: s,
-        header: a,
-        success: function (t) {
-          o.isShowLoading && n.hideLoading(), n.doSuccess2(o, t);
-        },
-        fail: function (t) {
-          o.isShowLoading && n.hideLoading(), n.doFail(o, t);
+
+    //-- 获取一下token --
+    this.ck_api_token((api_tk)=> {
+
+        var dd= t.deep_cp(o.data);
+        var now=t.gettimestamp();
+        var tk=this.set_req_sign(dd,i,now,api_tk);
+        if(tk){
+          a.reqtime=now;
+          a.token=tk;
+          a.ukey=api_tk.userkey
         }
-      }));
+
+        i = this.modifyUrl2(i, o), o.isShowLoading = void 0 === o.isShowLoading || o.isShowLoading,
+        o.isShowLoading && this.showLoading(), console.log("app.request", i, o), wx.request(Object.assign({}, o, {
+          url: i,
+          method: e,
+          data: s,
+          header: a,
+          success: function (t) {
+            o.isShowLoading && n.hideLoading(), n.doSuccess2(o, t);
+          },
+          fail: function (t) {
+            o.isShowLoading && n.hideLoading(), n.doFail(o, t);
+          }
+        }));
+    })
   },
+
   get2: function (t, e) {
     this.request2("GET", t, e);
   },
@@ -210,32 +254,107 @@ module.exports = {
     typeof func === "function" && func()
   },
  
+  
   //---promise的使用get----
   promiseGet: function (url, data, delay = 10000) {
+
+    var th = this;
+
     return new Promise((resolve, reject) => {
       this.check_timeout(url, delay, () => {
-        var th = this;
-        if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
-        data.isShowLoading && th.showLoading();
-        wx.request({
-          url,
-          method: 'GET',
-          header: { "content-type": "application/x-www-form-urlencoded" },
-          data: data.data,
-          success(res) {
-            data.isShowLoading && th.hideLoading();
-            resolve(res);
-          },
-          fail(err) {
-            data.isShowLoading && th.hideLoading();
-            if (err && err.errMsg && err.errMsg.indexOf('timeout') != -1) {
-              getApp().globalData.fail_url.set(t.gettimestamp(), url);
-              console.log('请求超时url---', getApp().globalData.fail_url);
-              th.doTimeOut()
-            }else{
-              reject(err);
+        //-- 获取一下token --
+        this.ck_api_token((api_tk)=> {
+
+          if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
+          data.isShowLoading && th.showLoading();
+
+          var url1=url;
+          var arr_in_url=t.getParams(url1);
+
+          var header={"content-type": "application/x-www-form-urlencoded"};
+          var now = t.gettimestamp();
+
+          var new_data={...arr_in_url,...data.data};
+          var tk = this.set_req_sign(new_data, url1, now, api_tk);
+
+          if (tk) {
+            header.reqtime = now;
+            header.token = tk;
+            header.ukey = api_tk.userkey
+          }
+
+          wx.request({
+            url,
+            method: 'GET',
+            header: header,
+            data: data.data,
+            success(res) {
+              data.isShowLoading && th.hideLoading();
+              resolve(res);
+            },
+            fail(err) {
+              data.isShowLoading && th.hideLoading();
+              if (err && err.errMsg && err.errMsg.indexOf('timeout') != -1) {
+                getApp().globalData.fail_url.set(t.gettimestamp(), url);
+                console.log('请求超时url---', getApp().globalData.fail_url);
+                th.doTimeOut()
+              } else {
+                reject(err);
+              }
             }
+          })
+
+        })
+      })
+    })
+  },
+  //---promise的使用get----
+  promiseGetNodef: function (url, data, delay = 10000) {
+    var url1=url;
+    var arr_in_url=t.getParams(url1);
+    return new Promise((resolve, reject) => {
+      this.check_timeout(url, delay, () => {
+
+        //-- 获取一下token --
+        this.ck_api_token((api_tk)=> {
+
+          var th = this;
+          if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
+          data.isShowLoading && th.showLoading();
+
+          var header = {"content-type": "application/x-www-form-urlencoded"};
+          var now = t.gettimestamp();
+
+          var new_data={...arr_in_url,...data.data};
+          var tk = this.set_req_sign(new_data, url1, now, api_tk);
+
+          if (tk) {
+            header.reqtime = now;
+            header.token = tk;
+            header.ukey = api_tk.userkey
           }
+
+          wx.request({
+            url,
+            method: 'GET',
+            header: header,
+            data: data.data,
+            success(res) {
+              data.isShowLoading && th.hideLoading();
+              resolve(res);
+            },
+            fail(err) {
+              data.isShowLoading && th.hideLoading();
+              if (err && err.errMsg && err.errMsg.indexOf('timeout') != -1) {
+                getApp().globalData.fail_url.set(t.gettimestamp(), url);
+                console.log('请求超时url---', getApp().globalData.fail_url);
+                th.doTimeOut()
+              } else {
+                reject(err);
+              }
+            }
+          })
+
         })
       })
     })
@@ -244,47 +363,153 @@ module.exports = {
   //---promise的使用post----
   promisePost: function (url, data) {
     var th = this;
+    var url1=url;
+
+    var arr_in_url=t.getParams(url1);
+
     if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
     var post_data = data.data;
-    var header = { "content-type": "application/x-www-form-urlencoded" };
-    if (data.is_json) {
-      header = { 'content-type': 'application/json' };
-      post_data = JSON.stringify(post_data);
-    };
+
     return new Promise((resolve, reject) => {
-      data.isShowLoading && th.showLoading();
-      wx.request({
-        url,
-        method: 'POST',
-        header: header,
-        data: post_data,
-        success(res) {
-          data.isShowLoading && th.hideLoading();
-          resolve(res);
-        },
-        fail(err) { data.isShowLoading && th.hideLoading(); reject(err); }
-      })
+
+        //-- 获取一下token --
+        this.ck_api_token((api_tk)=> {
+
+            var header = { "content-type": "application/x-www-form-urlencoded" };
+            var now = t.gettimestamp();
+
+            var new_data=null;
+            if(!Array.isArray(post_data)) {
+              //-- 拼接连接中带有的参数 --
+              new_data = {...arr_in_url, ...post_data};
+            }else{
+              new_data=post_data
+            }
+
+            var tk = this.set_req_sign(new_data, url1, now, api_tk);
+
+            if (data.is_json) {
+                header = { 'content-type': 'application/json' };
+                tk = this.set_req_sign(new_data, url1, now, api_tk,1);
+                post_data = JSON.stringify(post_data);
+            };
+
+            if (tk) {
+              header.reqtime = now;
+              header.token = tk;
+              header.ukey = api_tk.userkey
+            }
+
+            data.isShowLoading && th.showLoading();
+            wx.request({
+              url,
+              method: 'POST',
+              header: header,
+              data: post_data,
+              success(res) {
+                data.isShowLoading && th.hideLoading();
+                resolve(res);
+              },
+              fail(err) { data.isShowLoading && th.hideLoading(); reject(err); }
+            })
+        })
+
+    })
+  },
+  //---promise的使用post----
+  promisePostNodef: function (url, data) {
+    var th = this;
+    var url1=url;
+    var arr_in_url=t.getParams(url1);
+
+    if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
+
+    return new Promise((resolve, reject) => {
+
+        //-- 获取一下token --
+        this.ck_api_token((api_tk)=> {
+          var post_data = data.data;
+          var header = { "content-type": "application/x-www-form-urlencoded" };
+
+          var now = t.gettimestamp();
+
+          //-- 拼接连接中带有的参数 --
+          var new_data={...arr_in_url,...post_data};
+
+          var tk = this.set_req_sign(new_data, url1, now, api_tk);
+
+          if (data.is_json) {
+            header = { 'content-type': 'application/json' };
+            tk = this.set_req_sign(new_data, url1, now, api_tk,1);
+            post_data = JSON.stringify(post_data);
+          };
+
+          if (tk) {
+            header.reqtime = now;
+            header.token = tk;
+            header.ukey = api_tk.userkey
+          }
+
+          data.isShowLoading && th.showLoading();
+          wx.request({
+            url,
+            method: 'POST',
+            header: header,
+            data: post_data,
+            success(res) {
+              data.isShowLoading && th.hideLoading();
+              resolve(res);
+            },
+            fail(err) { data.isShowLoading && th.hideLoading(); reject(err); }
+          })
+        })
+
     })
   },
  
   //---promise的使用delete----
   promiseDelete: function (url, data) {
     var th = this;
-    if(!data) data={};
+    var url1=url;
+    var arr_in_url=t.getParams(url1);
+
+
     if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
     return new Promise((resolve, reject) => {
-      data && data.isShowLoading && th.showLoading();
-      wx.request({
-        url,
-        method: 'DELETE',
-        header: { "content-type": "application/x-www-form-urlencoded" },
-        data: data.data,
-        success(res) {
-          data && data.isShowLoading && th.hideLoading();
-          resolve(res);
-        },
-        fail(err) { data.isShowLoading && th.hideLoading(); reject(err); }
-      })
+      data.isShowLoading && th.showLoading();
+
+        //-- 获取一下token --
+        this.ck_api_token((api_tk)=> {
+
+          var header={"content-type": "application/x-www-form-urlencoded"};
+          var now = t.gettimestamp();
+
+          //-- 拼接连接中带有的参数 --
+          var new_data={...arr_in_url,...data.data};
+
+          var tk = this.set_req_sign(new_data, url1, now, api_tk);
+          if (tk) {
+            header.reqtime = now;
+            header.token = tk;
+            header.ukey = api_tk.userkey
+          }
+
+          wx.request({
+            url,
+            method: 'DELETE',
+            header: header,
+            data: data.data,
+            success(res) {
+              data.isShowLoading && th.hideLoading();
+              resolve(res);
+            },
+            fail(err) {
+              data.isShowLoading && th.hideLoading();
+              reject(err);
+            }
+          })
+
+        })
     })
   },
  
@@ -292,27 +517,58 @@ module.exports = {
   //---promise的使用put----
   promisePut: function (url, data) {
     var th = this;
+    var url1=url;
+
+    var arr_in_url=t.getParams(url1);
+
     if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
     var post_data = data.data;
-    var header = { "content-type": "application/x-www-form-urlencoded" };
-    if (data.is_json) {
-      header = { 'content-type': 'application/json' };
-      post_data = JSON.stringify(post_data);
-    };
-    return new Promise((resolve, reject) => {
-      data.isShowLoading && th.showLoading();
-      wx.request({
-        url,
-        method: 'PUT',
-        header: header,
-        data: post_data,
-        success(res) {
-          data.isShowLoading && th.hideLoading();
-          resolve(res);
-        },
-        fail(err) { data.isShowLoading && th.hideLoading(); reject(err); }
-      })
-    })
+
+
+        var y_post_data=t.deep_cp(post_data);
+        if(!Array.isArray(post_data)) {
+          y_post_data = {...arr_in_url, ...y_post_data};
+        }
+
+        return new Promise((resolve, reject) => {
+
+              //-- 获取一下token --
+              this.ck_api_token((api_tk)=> {
+
+                var header = {"content-type": "application/x-www-form-urlencoded"};
+                var now = t.gettimestamp();
+                var tk = this.set_req_sign(y_post_data, url1, now, api_tk);
+
+                if (data.is_json) {
+                  header = {'content-type': 'application/json'};
+                  tk = this.set_req_sign(y_post_data, url1, now, api_tk, 1);
+                  post_data = JSON.stringify(post_data);
+                }
+
+                if (tk) {
+                  header.reqtime = now;
+                  header.token = tk;
+                  header.ukey = api_tk.userkey
+                }
+
+                data.isShowLoading && th.showLoading();
+                wx.request({
+                  url,
+                  method: 'PUT',
+                  header: header,
+                  data: post_data,
+                  success(res) {
+                    data.isShowLoading && th.hideLoading();
+                    resolve(res);
+                  },
+                  fail(err) {
+                    data.isShowLoading && th.hideLoading();
+                    reject(err);
+                  }
+                })
+              })
+        })
+
   },
  
   //--------具有时间限制的读取接口----------
@@ -333,21 +589,51 @@ module.exports = {
     var th = this;
     var Mathod = "POST";
  
+    var url1=url;
+    var arr_in_url=t.getParams(url1);
+
     if (mathod) Mathod = mathod;
     this.showLoading();
     if (url.indexOf("http") == -1) url = getApp().globalData.setting.url + url;
-    var str = JSON.stringify(data);
-    wx.request({
-      url: url,
-      data: str,
-      method: Mathod,
-      header: {
+
+    //-- 获取一下token --
+    this.ck_api_token((api_tk)=> {
+
+      var header={
         'content-type': 'application/json'
-      },// 设置请求的 header
-      success: function (res) { succ(res); th.hideLoading(); },
-      fail: function (res) { fail(res); }
+      };
+
+      var dd= t.deep_cp(data);
+      if(!Array.isArray(data)) {
+        dd = {...arr_in_url, ...dd};
+      }
+
+      var now=t.gettimestamp();
+      var tk=this.set_req_sign(dd,url1,now,api_tk,1);
+      if(tk){
+        header.reqtime=now;
+        header.token=tk;
+        header.ukey=api_tk.userkey
+      }
+
+      var str = JSON.stringify(data);
+      wx.request({
+        url: url,
+        data: str,
+        method: Mathod,
+        header: header,// 设置请求的 header
+        success: function (res) {
+          succ(res);
+          th.hideLoading();
+        },
+        fail: function (res) {
+          fail(res);
+        }
+      })
     })
   },
+  
+
  
   promise_downimg(url) {
     return new Promise((resolve, reject) => {
@@ -362,6 +648,66 @@ module.exports = {
         }
       });
     })
+  },
+
+  //判断有没有获取到api_token
+  ck_api_token(func){
+    var api_token = wx.getStorageSync('api_token');
+    var api_token_time = wx.getStorageSync('api_token_time');
+    //token有存在本地的时候
+    if(api_token){
+      //判断有没有超出token的时间，超出的话就要重头拿token
+      var now=t.formar_day();
+      if(now!=api_token_time){
+          //调用接口获取token
+          getApp().get_api_token(func);
+          return false;
+      }
+      func(api_token);
+      return  false;
+    }
+    getApp().get_api_token(func);
+  },
+
+  //接口加密过程
+  set_req_sign(data,url,now,api_tk,is_json){
+    if(!url) return '';
+    var name2=url.split('?')[0];
+    if(!name2) return '';
+
+    //确保不要有前缀
+    name2=name2.replace(setting.url,'')
+
+    if(!now) now=t.gettimestamp();
+    if(!api_tk){
+      api_tk=wx.getStorageSync('api_token');
+    }
+    var userkey = api_tk;
+    var token2="";
+
+    if(data && Object.keys(data).length>0) {
+      var req4 ='';
+      if(is_json){
+        req4 = JSON.stringify(data);
+      }else {
+        // 自定义序列化函数
+        function stringifyReplacer(key, value) {
+          if (typeof value === 'number') {
+            return String(value);
+          }
+          return value;
+        }
+        req4 = JSON.stringify(data, stringifyReplacer);
+      }
+      console.log(req4+':---token0');
+      token2 = md5(req4).toUpperCase();
+      console.log(name2+':---token1:'+token2);
+    }
+    var str=name2.toUpperCase()+token2+now+userkey.token+setting.environment_key;
+    console.log('---tk_str:'+str);
+    var tk = md5(str).toUpperCase();
+    return tk;
   }
  
+
 };
 \ No newline at end of file
@@ -633,6 +633,18 @@ module.exports = {
 	    return t.getFullYear() +c+(t.getMonth() + 1)+c+t.getDate();
 	},
  
+    formar_day(e,char){
+        var t= new Date();
+        if(e) t=new Date(1e3 * e);
+
+        var c="-";
+        if(char) c=char;
+        var ck=function (e){
+            return e>=10? e : "0" + e;
+        }
+        return t.getFullYear() +c+ck(t.getMonth() + 1)+c+ck(t.getDate());
+    },
+
     json2Form: function(e) {
         var r = [];
         for (var t in e) r.push(encodeURIComponent(t) + "=" + encodeURIComponent(e[t]));
@@ -1019,5 +1031,16 @@ module.exports = {
         //判断e是不是对象类型
         var new_e = JSON.parse(JSON.stringify(e));
         return new_e;
+    },
+    getParams(url) {
+        const search = url.split('?')[1];
+        if (!search) return {};
+        const paramArr = search.split('&');
+        const paramObj = {};
+        for (const param of paramArr) {
+            const [key, value] = param.split('=');
+            paramObj[key] = value;
+        }
+        return paramObj;
     }
 };