Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

season
2 parents 48d23196 624f9d29
Showing 18 changed files with 342 additions and 49 deletions
app.wxss
components/diy_notice/diy_notice.wxml
components/diy_searchbox/diy_searchbox.js
components/diy_searchbox/diy_searchbox.wxml
components/diy_searchbox/diy_searchbox.wxss
packageA/pages/jfbuy/jfbuy.js
packageA/pages/jfbuy/jfbuy.wxml
packageA/pages/jfbuy/jfbuy.wxss
packageD/pages/user/coupons/coupons.wxml
packageE/pages/cart/cart2/cart2.js
packageE/pages/user/cardinfo/cardinfo.js
packageE/pages/user/cardinfo/cardinfo.wxml
packageE/pages/user/cardinfo/cardinfo.wxss
pages/index/index/index.wxml
pages/user/plus/plus.js
pages/user/plus/plus.wxml
pages/user/plus/plus.wxss
utils/pay.js
@@ -1207,6 +1207,9 @@ background: #ffe3e2;
   content: "\e615";
 }
+.icon-search_fd:before {
+    content: "\e618";
+}
 /* 去掉零售价划线 */
 .no_line_x{
@@ -3,8 +3,8 @@
     <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
     <navigator url="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
-            <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
-            <view class="marquee">
+            <image class="image_c" mode="heightFix"  src="{{object.leftImage ? object.leftImage : (imghost+'/miniapp/images/notice.png')}}"></image>
+            <view class="marquee" style="{{object.leftImage ? 'margin-left:20rpx;' :''}}">
                 <view class="content">
                     <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
                     <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
@@ -18,8 +18,8 @@
     <block wx:elif="{{object.AppId}}">
         <navigator target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}">
             <view class="big_border">
-                <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
-                <view class="marquee">
+                <image class="image_c" mode="heightFix"  src="{{object.leftImage ? object.leftImage : (imghost+'/miniapp/images/notice.png')}}"></image>
+                <view class="marquee" style="{{object.leftImage ? 'margin-left:20rpx;' :''}}">
                     <view class="content">
                         <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
                         <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
@@ -35,8 +35,8 @@
 	<block wx:elif="{{object.finderUserName && object.video_type}}">
     <view bindtap="nv_void" data-feedId="{{object.feedId}}" data-video_type="{{object.video_type}}" data-finderUserName="{{object.finderUserName}}" class="s1_gk_a1"  style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
-            <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
-            <view class="marquee">
+            <image class="image_c" mode="heightFix"  src="{{object.leftImage ? object.leftImage : (imghost+'/miniapp/images/notice.png')}}"></image>
+            <view class="marquee" style="{{object.leftImage ? 'margin-left:20rpx;' :''}}">
                 <view class="content">
                     <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
                     <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
@@ -49,8 +49,8 @@
 	<block wx:else>
     <view data-url="{{object.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
-            <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
-            <view class="marquee">
+            <image class="image_c" mode="heightFix"  src="{{object.leftImage ? object.leftImage : (imghost+'/miniapp/images/notice.png')}}"></image>
+            <view class="marquee" style="{{object.leftImage ? 'margin-left:20rpx;' :''}}">
                 <view class="content">
                     <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
                     <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
@@ -9,6 +9,14 @@ Component({
       type: Object,
       value: null,
     },
+    transparent: {
+      type: Number,
+      value: 0,
+    },
+    nav_backgroundColor: {
+      type: String,
+      value: '',
+    },
   },
   data: {
     // 这里是一些组件内部数据
 <!--pages/diy_ss/diy_ss.wxml-->
  <!-- wx:if="{{object.style==1}}" -->
- <!-- first -->
+ <!-- first --> 
 <block wx:if="{{object.style==1}}">
-	<view class='ss' style="position: relative;background-color: #fff">
-		<view bindtap='click_sear'  class="s1_gk_a1" wx:if="{{first}}">
-		   <view class='s_ge'>
+	<view class='ss' style="position: relative;{{transparent ? '' : (nav_backgroundColor ? ('background-color:' + nav_backgroundColor) : 'background-color:#fff;')}}">
+		<view bindtap='click_sear'   class="s1_gk_a1 " wx:if="{{first}}">
+		   <view class="s_ge {{object.is_bord==1 ? 'is_bord' : ''}}" style="text-align: {{object.searchbox_center}};">
 			   <image src='{{imghost}}/miniapp/images/search.png'></image>
-		    	<text>请输入商品关键字</text>
+          <text wx:if="{{object.searchbox_text}}">{{object.searchbox_text}}</text>
+	           <text wx:else>请输入商品关键字</text>
 		   </view>
 		</view>
 		<!-- 响应搜索事件 -->
@@ -19,7 +20,7 @@
 			 <view class="his_str his_str1" wx:if="{{searchRecord.length>0}}">
 				<block wx:for="{{searchRecord}}"> 
 			 	   <view class="item" bindtap="sear_key" data-item="{{item}}" >{{item}}</view>
-				</block>		 	
+				</block>
 			 	<view wx:if="{{searchRecord.length>0}}" class="clear" bindtap="del_his">清除</view>
 			 </view>
 		</view>		
@@ -32,14 +33,16 @@
 <view style="position: relative;">
 	<view style='background-color:{{object.top_bgcolor}}; display: flex; align-items: center; justify-content: space-around;padding:16rpx 0;'>
 	    <view class='s2_left'>
-	        <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1">
-	        <image src='{{imghost}}/miniapp/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
+	        <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1 ">
+	        <image wx:if="{{object.leftImage}}" src='{{object.leftImage}}' style="margin:0;position: relative;left: 6rpx"></image>
+	        <image wx:else src='{{imghost}}/miniapp/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
 	        </navigator>
 	    </view>
-	    <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
-	        <navigator wx:if="{{first}}" bindtap='click_sear' class="s1_gk_a2 flex" style='height: 100%;color:{{object.word_color?object.word_color:"#fff"}}'>
+	    <view class="s2_cen {{object.is_bord==1 ? 'is_bord' : ''}}" style='background-color:{{object.inner_bgcolor}}'>
+	        <navigator wx:if="{{first}}" bindtap='click_sear' class="s1_gk_a2 flex " style='height: 100%;color:{{object.word_color?object.word_color:"#fff"}};'>
 	           <text class="iconfont icon-search" style="font-size: 40rpx;"></text>
-	           <text>请输入商品关键字</text>
+	           <text wx:if="{{object.searchbox_text}}">{{object.searchbox_text}}</text>
+	           <text wx:else>请输入商品关键字</text>
 	        </navigator>
 			<view wx:else class="s1_gk_a2" style='color:{{object.word_color?object.word_color:"#fff"}}'>
 					<!-- <view class="pr"> -->
@@ -63,7 +66,8 @@
 	    </view>
 	    <view class='s2_right'>
 	        <navigator open-type="switchTab"  url="/pages/cart/cart/cart" class="s1_gk_a1">
-	        <image src='{{imghost}}/miniapp/images/model/car.png' style="margin:0;;"></image>
+	        <image wx:if="{{object.rightImage}}" src='{{object.rightImage}}' style="margin:0;;"></image>
+	        <image wx:else src='{{imghost}}/miniapp/images/model/car.png' style="margin:0;;"></image>
 	        </navigator>
 	    </view>
@@ -7,7 +7,7 @@
 }
 .s_ge{
-    width: 700rpx;
+    /* width: 700rpx; */
     height: 70rpx;
     text-align: center;
     border-radius: 8rpx;
@@ -15,6 +15,7 @@
     background: #fff none repeat scroll 0 0;
     border: 2px solid #eee;
     line-height: 64rpx;
+    padding: 0 10rpx;
 }
 .s_ge image{
@@ -153,7 +154,9 @@
 	color: #FF5B5A;
 	font-size: 26rpx;
 }
-
+.is_bord{
+  border-radius: 30rpx !important;
+}
 /* .w100 {
 	width: 100%;
 	box-sizing: border-box;
@@ -35,6 +35,7 @@ Page({
 		key_str:'',
 		pattern:0,      //分成的方式
 		pageSize:10,
+	    curr:10,
 		currentPage:1,  //当前的页码
 		// canvasHidden: 1, //-- 隐藏画布 --
@@ -57,8 +58,12 @@ Page({
 		triggered: false,
 		isPullDownRefresh: false,
-		
-		
+
+	    //-- 和搜索框相关的 --
+	    search_ing:0,
+	    hiddenClear:1,
+	    focus:false,
+	    keyword:''
   },
   /**
@@ -345,6 +350,16 @@ Page({
 		} else {
 			data.stypeup = 1;
 		};
+
+		var word=this.data.keyword;
+
+		//如果没有关闭搜索的话，就看不清理keyword
+		if(!this.data.keyword && this.data.search_ing){
+			if(this.data.requestData && this.data.requestData.keyword){
+				word=this.data.requestData.keyword;
+			}
+		}
+		data.keyword=word
 		// this.data.requestData = data;
 		this.setData({
@@ -353,9 +368,44 @@ Page({
 		this.request_list(data);
 	},
-	
-	
+	sear_list(){
+		var th=this;
+		var psize=th.data.curr;
+
+		this.setData({
+			is_no_data2:0,
+			is_no_more2:0,
+			list2:[],
+			is_load2: 0,
+			currentPage2:1,
+			pageSize:psize
+		});
+
+		var data = {
+			store_id:oo.stoid,
+			stype: this.data.requestData.stype,
+			stypeup:1,
+			page:1,
+			pageSize:psize
+		};
+
+		if(this.data.isUp) {
+			data.stypeup = 0;
+		} else {
+			data.stypeup = 1;
+		};
+
+		data.keyword=this.data.keyword
+
+		// this.data.requestData = data;
+		this.setData({
+			requestData: data
+		})
+
+		this.request_list(data);
+	},
+
 	request_list: function(data, callback){	
 		// console.log('触发上拉刷新');
@@ -421,9 +471,6 @@ Page({
 		this.request_list(data);
 	},
-
-  
-	
 	//---图片失败，默认图片---
 	bind_bnerr2: function (e) {
@@ -491,6 +538,52 @@ Page({
 		var viewHeight = this.data.clientWidth / ratio;
 		var con_heihgt=this.data.clientHeight-viewHeight;
 		this.setData({con_heihgt:con_heihgt,isshow:1})
-	
+	},
+
+
+	/*-- 和搜索相关 --*/
+	show_search(){
+		this.setData({
+			search_ing:1,
+			hiddenClear:1,
+			keyword:'',
+			focus:true
+		})
+	},
+
+	getInput(e) {
+		let val = e.detail.value;
+		if (val) {
+			this.setData({
+				keyword: e.detail.value,
+				hiddenClear: false,
+			});
+		} else {
+			this.setData({
+				hiddenClear: true,
+			});
+		}
+	},
+
+	clearInput() {
+		this.setData({
+			keyword: '',
+			hiddenClear: true,
+		});
+	},
+
+	close_layer:function (){
+		this.setData({
+			search_ing:0,
+			hiddenClear:1,
+			keyword:'',
+		})
+		this.sear_list();
+	},
+
+	//开始搜索
+	submitSearch(){
+		this.sear_list();
 	}
+
 })
 \ No newline at end of file
@@ -23,6 +23,22 @@
 			<block wx:for="{{tab}}">
 				<view class="title-item {{currentIndex == (index+1) ? 'active' + (isUp?' active1':''):''}}" data-index="{{index+1}}" bindtap="clickTab">{{item}}</view>
 			</block>
+
+			<view catchtap="show_search" class="flex ai-center"  style="height:80rpx; width:80rpx">
+				<text class="iconfont icon-search_fd" style="font-size:30rpx; " ></text>
+			</view>
+
+		</view>
+
+		<view class="s_box" wx:if="{{search_ing}}" >
+			<view class="pdh20 pdv10 flex ai_c jc_sb">
+				<view class="input-box">
+					<input class="input-search" name="word" placeholder="请输入商品关键字"
+						   bindconfirm="submitSearch" bindinput="getInput" focus="{{focus}}" value="{{keyword}}"/>
+					<text class="iconfont icon-guan" hidden="{{hiddenClear}}" catchtap="clearInput"></text>
+				</view>
+				<button catchtap="close_layer" class="btn"  hover-class="none">取消</button>
+			</view>
 		</view>
 		<!-- <view> -->
@@ -69,3 +85,4 @@
 	</view>
 </view>
+
@@ -63,6 +63,7 @@ page {
 	width: 100%;
 	top: 0;
 	z-index: 3;
+	align-items: center;
 }
 .title .iconfont {
 	color: #ccc;
@@ -429,4 +430,55 @@ radio .wx-radio-input.wx-radio-input-checked::before{
 	margin-left:25rpx;
 	margin-right:25rpx;
 	margin-top: 30rpx;
-}
 \ No newline at end of file
+}
+
+
+/*-- 搜索相关 --*/
+.s_box{ background-color: #fff; width: 100%; }
+.input-box {
+	position: relative;
+	flex: 1;
+	padding-left: 50rpx;
+	padding-right: 70rpx;
+	background-color: #f0f0f0;
+	border-radius: 60rpx;
+}
+
+.input-box::before {
+	font-family: iconfont;
+	position: absolute;
+	left: 20rpx;
+	top: 50%;
+	transform: translateY(-50%);
+  content: '\e618';
+  color: #666;
+}
+
+.input-search {
+	position: relative;
+	padding: 10rpx;
+	font-size: 28rpx;
+}
+
+
+.btn {
+	margin-left: 0;
+	margin-right: 0;
+	line-height: 1;
+	padding: 20rpx;
+	font-size: 30rpx;
+}
+
+.btn::after {
+	border: none;
+}
+.icon-guan {
+	font-size: 20rpx;
+	padding: 10rpx;
+	position: absolute;
+	right: 20rpx;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+
@@ -46,7 +46,8 @@
 							<view class="c-r dash">
 								<view class="flex jc_sb ai_c">
 									<view class="pdr20">
-										<view class="fs28 ellipsis-1x">{{filter.getNum(detail.Sum)}}元微券</view>
+                  	<view class="fs28 ellipsis-1x" wx:if="{{detail.ActName}}">{{detail.ActName}}</view>
+										<view class="fs28 ellipsis-1x" wx:else>{{filter.getNum(detail.Sum)}}元微券</view>
 										<view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view>
 									</view>
 									<view class="shrink0">
@@ -117,8 +118,9 @@
 	<view class="popup">
 		<view class="popup-title">
 			<block wx:if="{{details[useIndex].isby == 1}}">包邮券</block>
+      <block wx:if="{{details[useIndex].ActName}}">{{details[useIndex].ActName}}</block>
 			<block wx:else>
-				{{filter.getNum(details[useIndex].Sum)}}元微券
+				{{filter.getNum(details[useIndex].Sum)}}元微券  
 			</block>
 		</view>
 		<!-- <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view> -->
@@ -5082,7 +5082,7 @@ Page({
           }
               //如果不立即购买或者秒杀，如果是线下库存购买的时候
-          if ([0,3,5,7,10].indexOf(goods.prom_type)>-1 && th.data.sales_rules >= 2 && !g_item.whsle_id  && !getApp().is_virtual(g_item) ) {
+          if (!goods.is_gift && [0,3,5,7,10].indexOf(goods.prom_type)>-1 && th.data.sales_rules >= 2 && !g_item.whsle_id  && !getApp().is_virtual(g_item) ) {
             var isok = 1;
             await th.check_store_num(goods.goods_id, t_item.pickup_id, goods.goods_num, function (res) {
               isok = res;
@@ -65,11 +65,14 @@ Page({
     //-----------等级卡说明-------------------
     getApp().request.promiseGet("/api/weshop/storeconfig/get/" + os.stoid, {
     }).then(res => {
-      var is_cardrule = res.data.data.cardrules;
-      w.wxParse("content", "html", ut.format_content(is_cardrule), ee, 6);
-      ee.setData({
-        is_card_rule: is_cardrule
-      });
+         var is_cardrule = res.data.data.cardrules;
+         var switch_list = res.data.data.switch_list;
+         var swi_arr = JSON.parse(switch_list);
+          w.wxParse("content", "html", ut.format_content(is_cardrule), ee, 6);
+          ee.setData({
+              is_card_rule: is_cardrule,
+              plus_bg_color: swi_arr.plus_bg_color,
+          });
     })
     //----------------------------获取最大的卡类-----------------------
@@ -4,9 +4,13 @@
    <view> 
   <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
 </view>
- <view class="Opening_bk">
-      <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
-    </view>
+<view class="Opening_bk">
+<!--      <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>-->
+     <view class="rect">
+         <!-- 根据后台来定义一下背景颜色 -->
+         <view class="before" style="{{plus_bg_color?'background-color:'+plus_bg_color:''}}"></view>
+     </view>
+ </view>
         <view class="MemberPlus rel"style="background-image:url('{{user_card.CardImg}}');background-size: 100% 100%;background-repead:no-repead;">
@@ -220,7 +220,7 @@ align-items:center;
 .fs36{
   font-size: 36rpx; 
 }
-.Opening_bk image {
+.Opening_bk{
   position: absolute;
   width: 100%;
@@ -238,4 +238,24 @@ align-items:center;
   border-top-left-radius: 55rpx;  border-bottom-left-radius:55rpx;  }
  .content  .card_list .list .card_name{ max-width: 230rpx}
- .price_show .thr{color: #999; text-decoration:line-through }
 \ No newline at end of file
+ .price_show .thr{color: #999; text-decoration:line-through }
+
+
+ /* 定义矩形 */
+ .rect {
+   width: 100%;
+   height: 300rpx;
+   position: relative; /* 要设置位置是因为要设置扇形遮罩的位置 */
+   overflow: hidden;
+ }
+
+ /* 定义扇形遮罩 */
+ .rect .before {
+   width: 140%;
+   height: 300rpx;
+   background-color: #f0ba94;
+   position: absolute; /* 要用绝对定位 */
+   left: -20%;
+   top: -2rpx;
+   border-radius: 0 0 50% 50%; /* 只要顶部两个角是圆弧就好了 */
+ }
 \ No newline at end of file
@@ -435,7 +435,8 @@
       <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px;flex-shrink:0"></view>
       <block wx:for="{{template_arr}}">
         <block wx:if="{{item.content.is_top==1}}">
-          <view style="height:88rpx"></view>
+          <!-- <view style="height:88rpx"></view> -->
+          <view style="height:{{item.content.style==1 ? 110 : 88}}rpx"></view>
         </block>
       </block>
@@ -111,7 +111,8 @@ Page({
         that.setData({
           is_card_rule: is_cardrule,
           isyaoqingma: parseInt(swi_arr.isyaoqingma),
-          is_salesman: parseInt(swi_arr.is_staffno)
+          is_salesman: parseInt(swi_arr.is_staffno),
+          plus_bg_color: swi_arr.plus_bg_color,
         });
       }
     });
@@ -10,7 +10,10 @@
     <block wx:if="{{is_plusCard}}">
       <view class="Opening_plus">
         <view class="Opening_bk">
-          <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
+<!--          <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>-->
+           <view class="rect">
+              <view class="before" style="{{plus_bg_color?'background-color:'+plus_bg_color:''}}"></view>
+           </view>
         </view>
         <view class="swiper">
           <!-- 未开通会员swiper-item -->
@@ -58,7 +58,7 @@ page {
   width: 50%;
   text-align: center;
 }
-.Opening_bk image {
+.Opening_bk{
   position: absolute;
   z-index: 2;
   width: 100%;
@@ -404,4 +404,23 @@ margin-top: 10rpx;
 swiper-item{
   overflow: visible;
+}
+
+/* 定义矩形 */
+.rect {
+  width: 100%;
+  height: 300rpx;
+  position: relative; /* 要设置位置是因为要设置扇形遮罩的位置 */
+  overflow: hidden;
+}
+
+/* 定义扇形遮罩 */
+.rect .before {
+  width: 140%;
+  height: 300rpx;
+  background-color: #f0ba94;
+  position: absolute; /* 要用绝对定位 */
+  left: -20%;
+  top: -2rpx;
+  border-radius: 0 0 50% 50%; /* 只要顶部两个角是圆弧就好了 */
 }
 \ No newline at end of file
@@ -49,7 +49,6 @@ module.exports = {
                 wx.hideLoading();
                 if(t.data.code==0){
-
                     var is_pos_pay=t.data.data.is_pos_pay;
                     //-- 富有的插件支付 --
                     if(t.data.data.is_fuioupay){
@@ -93,6 +92,67 @@ module.exports = {
                         var p_data=t.data.data;
                         delete p_data.is_pos_pay; //清理掉，不然签名不通过
+
+                        var err_txt="";
+
+                        if(!p_data.acct && !err_txt){
+                            err_txt="未找到acct";
+                        }
+                        if(!p_data.appid && !err_txt){
+                            err_txt="未找到appid";
+                        }
+                        if(!p_data.cusid && !err_txt){
+                            err_txt="未找到cusid";
+                        }
+                        if(!p_data.notify_url && !err_txt){
+                            err_txt="未找到notify_url";
+                        }
+                        if(!p_data.orgid && !err_txt){
+                            err_txt="未找到orgid";
+                        }
+                        if(!p_data.paytype && !err_txt){
+                            err_txt="未找到paytype";
+                        }
+                        if(!p_data.randomstr && !err_txt){
+                            err_txt="未找到randomstr";
+                        }
+                        if(!p_data.remark && !err_txt){
+                            err_txt="未找到remark";
+                        }
+                        if(!p_data.reqsn && !err_txt){
+                            err_txt="未找到reqsn";
+                        }
+                        if(!p_data.sign && !err_txt){
+                            err_txt="未找到sign";
+                        }
+                        if(!p_data.signtype && !err_txt){
+                            err_txt="未找到signtype";
+                        }
+                        if(!p_data.trxamt && !err_txt){
+                            err_txt="未找到trxamt";
+                        }
+                        if(!p_data.validtime && !err_txt){
+                            err_txt="未找到validtime";
+                        }
+                        if(!p_data.version && !err_txt){
+                            err_txt="未找到version";
+                        }
+
+                        if(err_txt){
+                            i.wx_paying=0;
+                            getApp().confirmBox(err_txt);
+                            setTimeout(function(){
+                                wx.redirectTo({
+                                    url: "/pages/user/order_list/order_list",
+                                });
+                            },1000)
+                            return false;
+                        }
+
+
+
+
+
                         wx.openEmbeddedMiniProgram({
                             appId: 'wxef277996acc166c3',
                             extraData: p_data,