Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/pages/person/spread/index.js

@@ -37,12 +37,12 @@ export default class Index extends Component {
       }
 
       getMiniQrcode(payload).then(qrcode => {
-        rtLog.error(qrcode, "qrcodeqrcodeqrcodeqrcodeqrcodeqrcode")
+        console.log(qrcode, "qrcodeqrcodeqrcodeqrcodeqrcodeqrcode")
         let data = {
           qrcode,//小程序二维码
           nickname,//访问者名字
           avatarurl: avatarurl,//访问者头像
-          tip:personType == ROLE_CODE['CONSULTANT'] ? '扫一扫上面的二维码图案,成为我的客户' : '扫一扫上面的二维码图案,成为独立经纪人'
+          tip: personType == ROLE_CODE['CONSULTANT'] ? '扫一扫上面的二维码图案,成为我的客户' : '扫一扫上面的二维码图案,成为独立经纪人'
         }
         this.setState({
           qrcode
@@ -57,7 +57,7 @@ export default class Index extends Component {
     if (flag) {
       rtLog.error(flag, "flagflagflagflag,true")
       this.getPosterData().then(posterData => {
-        rtLog.error(posterData,"posterDataposterDataposterDataposterDataposterData")
+        rtLog.error(posterData, "posterDataposterDataposterDataposterDataposterData")
         this.setState({
           makePosterStatus: !!flag,
           posterData,
@@ -65,7 +65,7 @@ export default class Index extends Component {
         })
       })
     } else {
-      rtLog.error(flag,"flagflagflagflag,false")
+      rtLog.error(flag, "flagflagflagflag,false")
       this.setState({
         makePosterStatus: !!flag
       })
@@ -88,9 +88,9 @@ export default class Index extends Component {
             {
               personType == ROLE_CODE['CONSULTANT'] ? <View className='spread-code-tip'>扫一扫上面的二维码图案,成为我的客户</View> : <View className='spread-code-tip'>扫一扫上面的二维码图案,成为独立经纪人</View>
             }
-            
+
           </View>
-          <View className='save_btn'  onClick={() => { this.toggleVisiblePoster(true) }}>保存到手机</View>
+          <View className='save_btn' onClick={() => { this.toggleVisiblePoster(true) }}>保存到手机</View>
         </View>
       </Block>
 

src/pages/project/h5Page.js

@@ -510,7 +510,7 @@ export default class Index extends Component {
       `${originURL.origin}${originURL.path}?${queryString}`,
       originURL.hash
     ].join("#");
-
+    console.log(webURL,"webURLwebURLwebURLwebURLwebURLwebURLwebURLwebURL")
     return (
       <Block>
         {this.renderMaskBanner()}

src/pages/project/pay.js

@@ -0,0 +1,43 @@
+import Taro, { Component } from "@tarojs/taro";
+import ready from "@/utils/ready";
+
+export default class Index extends Component {
+  state = {
+
+  };
+
+  componentDidShow() {
+    ready.queue(() => {
+
+      console.log(this.$router, '支付中间页路径this.$routerthis.$router')
+
+      const queryParams = this.$router.params
+
+      Taro.requestPayment({
+        timeStamp: String(queryParams.timeStamp),
+        nonceStr: queryParams.nonceStr,
+        package: queryParams.package,
+        signType: queryParams.signType,
+        paySign: queryParams.sign,
+
+        success(res) {
+          Taro.navigateBack({ delta: 1 })
+        },
+        fail(err) {
+          Taro.navigateBack({ delta: 1 })
+        }
+      })
+    });
+  }
+
+
+  render() {
+
+    return (
+      <Block>
+
+
+      </Block>
+    );
+  }
+}

src/routes.js

@@ -311,6 +311,12 @@ const routes = [
     pkg: 'main',
     type: 'other',
   },
+  {
+    name: '支付',
+    page: 'pages/project/pay',
+    pkg: 'main',
+    type: 'other',
+  },
   {
     name: '授权',
     page: 'pages/auth/index',