[...]

apis/index.js

@@ -34,10 +34,10 @@ const request = (parameter) => {
 	// console.log('parameterDbug', parameter)
 	
 	// 加载提示
-	uni.showLoading({
+	// uni.showLoading({
-	    title: '加载中',
+	//     title: '加载中',
-		mask : true
+	// 	mask : true
-	});
+	// });
 	// 请求实例
 	return new Promise((resolve, reject) => {
 		uni.request({

components/coupon-template/coupon-template-1.vue

@@ -152,7 +152,7 @@
 				box-sizing: border-box;
 
 				.money {
-					font-size: 70rpx;
+					font-size: 50rpx;
 					font-weight: bold;
 				}
 			}

components/coupon-template/coupon-template-2.vue

@@ -127,7 +127,7 @@
 				box-sizing: border-box;
 
 				.money {
-					font-size: 70rpx;
+					font-size: 50rpx;
 					font-weight: bold;
 				}
 			}

pages.json

@@ -54,7 +54,8 @@
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#e93340"
 			}
-		}, {
+		}, 
+		{
 			"path": "pages/property/coupon/confirmOrder",
 			"name": "ConfirmOrder",
 			"style": {
@@ -62,6 +63,14 @@
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#e93340"
 			}
+		},{
+			"path": "pages/property/coupon/payStatus",
+			"name": "PayStatus",
+			"style": {
+				"navigationBarTitleText": "支付状态",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
 		}, {
 			"path": "pages/property/order/numberWeight",
 			"name": "NumberWeight",

pages/coupons/add.vue

@@ -92,6 +92,7 @@
 						@change="confirmDatePicker"
 					>
 					</u-calendar>
+					</u-calendar>
 					<!-- <tn-date-picker :show="showDatePicker" :monthNum="12" color="#e93340" :showTips="true" beginText="开始日期" endText="结束日期" @confirm="confirmDatePicker" @cancel="showDatePicker = false"/> -->
 				</block>
 				<block v-if="timeIndex === 1">
@@ -138,8 +139,8 @@
 				],
 				timeIndex		: 0,
 				times			: [
-					{ type: 2, text: '固定时间（区间范围）' },
+					{ type: 1, text: '固定时间（区间范围）' },
-					{ type: 1, text: '延期券（用户领取后有效天数）' }
+					{ type: 2, text: '延期券（用户领取后有效天数）' }
 				],
 				showDatePicker	: false,	// 活动弹出层时间
 				datePickerValue	: [],		// 活动时间

pages/property/coupon/confirmOrder.vue

@@ -17,8 +17,7 @@
 					<view class="sku">
 						<span>数量</span>
 						<span>
-							<u-number-box v-model="params.qty" :min='1' :max='1000'
+							<u-number-box v-model="params.qty" :min='1' :max='1000' @change='numberBoxChange' />
-								@change='numberBoxChange' />
 						</span>
 					</view>
 				</view>
@@ -57,8 +56,8 @@
 						<span>可用Eb总额：{{account.getEBBalance}}</span>
 					</view>
 				</view>
-				<u-icon v-if="selectTypeId!== '1'" name="checkmark-circle" color="#f7f7f7" size="50"></u-icon>
+				<u-icon v-if="selectTypeId!== '1'" name="checkmark-circle" color="#f7f7f7" size="50" />
-				<u-icon v-else name="checkmark-circle-fill" color="#e93340" size="50"></u-icon>
+				<u-icon v-else name="checkmark-circle-fill" color="#e93340" size="50" />
 			</view>
 
 		</view>
@@ -181,8 +180,7 @@
 					apiUrl = wxPay
 					data = {
 						order_no: this.order_no,
-						type: 'miniapp',
+						type: 'app'
-						openid: uni.getStorageSync('openid')
 					}
 				} else {
 					apiUrl = ebPay
@@ -191,16 +189,16 @@
 					}
 				}
 				apiUrl(data).then(res => {
-					let payInfo = res
+					let payInfo = JSON.parse(res)
+					console.log(payInfo, 'timeStamp...')
 					if (this.selectTypeId === '2') {
-						if (payInfo.timeStamp) {
+						if (payInfo.timestamp) {
+							
+							
+							// app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
 							uni.requestPayment({
-								provider: 'wxpay',
+								provider: "wxpay",
-								timeStamp: payInfo.timeStamp,
+								orderInfo: JSON.stringify(payInfo),
-								nonceStr: payInfo.nonceStr,
-								package: payInfo.package,
-								signType: payInfo.signType,
-								paySign: payInfo.paySign,
 								success: res => {
 									this.$refs.uToast.show({
 										title: '支付成功',
@@ -210,7 +208,7 @@
 									setTimeout(() => {
 										this.canPay = true
 										uni.reLaunch({
-											url: '/pages/order/payStatus?success=true'
+											url: '/pages/property/coupon/payStatus?success=true'
 										})
 									}, 3000);
 								},
@@ -224,11 +222,15 @@
 									setTimeout(() => {
 										this.canPay = true
 										uni.reLaunch({
-											url: '/pages/order/payStatus?success=false'
+											url: '/pages/property/coupon/payStatus?success=false'
 										})
 									}, 3000);
 								}
-							});
+							})
+							
+							// app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
+							
+							
 							
 						} else {
 							this.$refs.uToast.show({
@@ -239,12 +241,10 @@
 							setTimeout(() => {
 								this.canPay = true
 								uni.reLaunch({
-									url: '/pages/order/payStatus?success=true'
+									url: '/pages/property/coupon/payStatus?success=true'
 								})
 							}, 3000);
 						}
-
-
 					} else {
 						this.$refs.uToast.show({
 							title: res,
@@ -254,11 +254,10 @@
 						setTimeout(() => {
 							this.canPay = true
 							uni.reLaunch({
-								url: '/pages/order/payStatus?success=true'
+								url: '/pages/property/coupon/payStatus?success=true'
 							})
 						}, 3000);
 					}
-
 				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.message,

pages/property/coupon/couponMore.vue

@@ -2,7 +2,7 @@
 	<view class="Coupon">
 		<!-- 有优惠券列表 -->
 		<view class="coupon-content">
-			<couponTemplate v-for="(item,index) in lists" :key='index' :item="{...item}" :action="actions" />
+			<couponTemplate v-for="(item,index) in lists" :key='index' :item="{...item}" />
 		</view>
 
 		<!-- 没有优惠券列表 -->

pages/property/coupon/payStatus.vue

@@ -0,0 +1,101 @@
+<template>
+  <view class="PayStatus">
+    <image class="payStatusImg" :src="success?'/static/images/paySuccess.png':'/static/images/payFail.png'" mode="widthFix" />
+    <view class="payTitle">{{success?'支付成功':'支付失败'}}</view>
+    <view class="payDes">{{success?'您已支付完成，订单稍后配送':'吼吼，您的支付未完成'}}</view>
+    <view class="payBackCheck">
+      <!-- <view class="check" v-if='success' @click="check">查看权证</view> -->
+      <view class="back" @click="back">返回首页</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+		success:false,// 支付失败false 支付成功true
+      };
+    },
+	onLoad(e) {
+		if(e.success === 'true'){
+			uni.setNavigationBarTitle({
+				title:'支付成功'
+			})
+			this.success=true
+		}else{
+			uni.setNavigationBarTitle({
+				title:'支付失败'
+			})
+			this.success=false
+		}
+	},
+    methods: {
+      check() {
+        uni.reLaunch({
+          url:'/pages/property/order/numberWeight'
+        })
+      },
+      back() {
+        uni.reLaunch({
+          url:'/pages/equity/index'
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .PayStatus {
+    width: 100%;
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-start;
+    box-sizing: border-box;
+
+    .payStatusImg {
+      width: 300rpx;
+      padding: 50rpx 0;
+      margin-top: 100rpx;
+    }
+
+    .payTitle {
+      font-size: 34rpx;
+      font-weight: bold;
+      color: #353535;
+    }
+
+    .payDes {
+      font-size: 26rpx;
+      color: #666;
+      padding: 20rpx;
+      margin-bottom: 30rpx;
+    }
+
+    .payBackCheck {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-around;
+      box-sizing: border-box;
+      font-size: 28rpx;
+      width: 100%;
+
+      .check {
+        border: $main-color solid 1rpx;
+        color: $main-color;
+        padding: 14rpx 50rpx;
+        border-radius: 4rpx;
+      }
+
+      .back {
+        background-color: $main-color;
+        color: #fff;
+        padding: 14rpx 50rpx;
+        border-radius: 4rpx;
+      }
+    }
+  }
+</style>

pages/store/basics.vue

@@ -258,6 +258,7 @@
 			},
 			// 添加展示模块
 			addModule(){
+				console.log('添加模板，，，，')
 				let modulesList = this.modulesType.map(val => {
 					return val.value
 				})
@@ -407,6 +408,8 @@
 		color: $text-price;
 		background: white;
 		margin-top: $margin;
+		position: relative;
+		z-index: 10;
 		.icon{
 			vertical-align: middle;
 			margin-right: $margin/3;

pages/vip/index.vue

@@ -1,5 +1,4 @@
 <template>
-     <!-- v-if="!loding" -->
 	<view class="content">
         <swiper class="vip-container" previous-margin="45rpx" next-margin="45rpx" circular @change="swiperChange">
         	<swiper-item class="swiper-item" v-for="(item, index) in identities" :key="index">

unpackage/dist/build/app-plus/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

unpackage/dist/build/app-plus/app-config.js

@@ -1 +0,0 @@
-(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

unpackage/dist/build/app-plus/manifest.json

@@ -1 +0,0 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__CD19AAD","name":"易品新境","version":{"name":"1.0.0","code":"100"},"description":"易品新境为商家提供营销引流工具","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"Geolocation":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":false,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#f5f5f5"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"oauth":{"univerify":{},"weixin":{"appid":"wx222fbe58feee7819","appsecret":"3d24525a636d7573a8fae885097d5cf7","UniversalLinks":""}},"payment":{"weixin":{"__platform__":["android"],"appid":"wx222fbe58feee7819","UniversalLinks":""}},"share":{"weixin":{"appid":"wx222fbe58feee7819","UniversalLinks":""}},"maps":{},"ad":{},"geolocation":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.1.18","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#bababa","selectedColor":"#e93340","backgroundColor":"#FFFFFF","borderStyle":"rgba(255,255,255,0.4)","list":[{"pagePath":"pages/equity/index","text":"通证权易","iconPath":"static/tabBar/tabBar_icon_00.png","selectedIconPath":"static/tabBar/tabBar_show_00.png"},{"pagePath":"pages/market/index","text":"转让市场","iconPath":"static/tabBar/tabBar_icon_01.png","selectedIconPath":"static/tabBar/tabBar_show_01.png"},{"pagePath":"pages/store/index","text":"企业工具","iconPath":"static/tabBar/tabBar_icon_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png"},{"pagePath":"pages/property/index","text":"我的资产","iconPath":"static/tabBar/tabBar_icon_03.png","selectedIconPath":"static/tabBar/tabBar_show_03.png"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}