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

# Conflicts:
#	src/pages/project/h5Page.js

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://dev.fangdeal.cn"', //测试
-    WSS_HOST: '"wss://dev.fangdeal.cn"',
-    // HOST: '"https://wx.fangdeal.cn"', //正式
-    // WSS_HOST: '"wss://wx.fangdeal.cn"',
+    // HOST: '"https://dev.fangdeal.cn"', //测试
+    // WSS_HOST: '"wss://dev.fangdeal.cn"',
+    HOST: '"https://wx.fangdeal.cn"', //正式
+    WSS_HOST: '"wss://wx.fangdeal.cn"',
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
     Version: "V3.5.29"

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行互动",
-	"appid": "wxd9ee3a9480a4e544",
+	"appid": "wxd6f47a9bb3052175",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/components/taro-plugin-canvas/index.js

@@ -1,15 +1,10 @@
-import Taro, { Component } from '@tarojs/taro';
+import Taro, { Component } from "@tarojs/taro";
 // import PropTypes from 'prop-types';
-import { Canvas } from '@tarojs/components';
-import { randomString, getHeight, downloadImageAndInfo } from './utils/tools';
-import {
-  drawImage,
-  drawText,
-  drawBlock,
-  drawLine,
-} from './utils/draw';
-import './index.css';
-import rtLog from '@/utils/rtLog';
+import { Canvas } from "@tarojs/components";
+import { randomString, getHeight, downloadImageAndInfo } from "./utils/tools";
+import { drawImage, drawText, drawBlock, drawLine } from "./utils/draw";
+import "./index.css";
+import rtLog from "@/utils/rtLog";
 
 let count = 1;
 export default class CanvasDrawer extends Component {
@@ -26,8 +21,8 @@ export default class CanvasDrawer extends Component {
       pxWidth: 0,
       pxHeight: 0,
       debug: false,
-      factor: 0,
-    }
+      factor: 0
+    };
     this.canvasId = randomString(10);
     this.ctx = null;
     this.cache = {};
@@ -46,12 +41,12 @@ export default class CanvasDrawer extends Component {
       const screenWidth = sysInfo.screenWidth;
       this.setState({
         factor: screenWidth / 750
-      })
+      });
       this.onCreate();
-    }, 0)
+    }, 0);
   }
 
-  componentWillUnmount() { }
+  componentWillUnmount() {}
 
   /**
    * @description rpx => px 基础方法
@@ -65,7 +60,7 @@ export default class CanvasDrawer extends Component {
       return parseInt(rpx * factor);
     }
     return rpx * factor;
-  }
+  };
   /**
    * @description px => rpx
    * @param { number } px - 需要转换的数值
@@ -78,7 +73,7 @@ export default class CanvasDrawer extends Component {
       return parseInt(px / factor);
     }
     return px / factor;
-  }
+  };
 
   /**
    * @description 下载图片并获取图片信息
@@ -88,19 +83,22 @@ export default class CanvasDrawer extends Component {
   _downloadImageAndInfo = (image, index) => {
     return new Promise((resolve, reject) => {
       downloadImageAndInfo(image, index, this.toRpx)
-      .then(
-        (result) => {
+        .then(result => {
           this.drawArr.push(result);
           resolve();
-        }
-      )
-      .catch(err => {
-        console.log(err);
-        rtLog.error('下载图片失败, 图片地址 ('+ image +'), 错误消息: ' + ( err.message || err.errMsg || err))
-        reject(err)
-      });
-    })
-  }
+        })
+        .catch(err => {
+          console.log(err);
+          rtLog.error(
+            "下载图片失败, 图片地址 (" +
+              (image && image.url ? image.url : "无") +
+              "), 错误消息: " +
+              (err.message || err.errMsg || err)
+          );
+          reject(err);
+        });
+    });
+  };
   /**
    * @param  {} images=[]
    */
@@ -108,10 +106,12 @@ export default class CanvasDrawer extends Component {
     const drawList = [];
     let imagesTemp = images;
 
-    imagesTemp.forEach((image, index) => drawList.push(this._downloadImageAndInfo(image, index)));
+    imagesTemp.forEach((image, index) =>
+      drawList.push(this._downloadImageAndInfo(image, index))
+    );
 
     return Promise.all(drawList);
-  }
+  };
 
   /**
    * @param
@@ -124,17 +124,17 @@ export default class CanvasDrawer extends Component {
           .then(() => {
             resolve();
           })
-          .catch((e) => {
+          .catch(e => {
             console.log(e);
-            reject(e)
+            reject(e);
           });
       } else {
-        setTimeout(()=>{
+        setTimeout(() => {
           resolve(1);
-        }, 500)
+        }, 500);
       }
-    })
-  }
+    });
+  };
 
   /**
    * @param  {} w
@@ -142,53 +142,61 @@ export default class CanvasDrawer extends Component {
    * @param  {} debug
    */
   initCanvas = (w, h, debug) => {
-    return new Promise((resolve) => {
-      console.debug('-----------start to init canvas state------------')
-      this.setState({
-        pxWidth: this.toPx(w),
-        pxHeight: this.toPx(h),
-        debug,
-      }, () => {
-        console.debug('-----------finish init canvas state------------')
-        resolve()
-      });
+    return new Promise(resolve => {
+      console.debug("-----------start to init canvas state------------");
+      this.setState(
+        {
+          pxWidth: this.toPx(w),
+          pxHeight: this.toPx(h),
+          debug
+        },
+        () => {
+          console.debug("-----------finish init canvas state------------");
+          resolve();
+        }
+      );
     });
-  }
+  };
   /**
    * @param  { boolean }
    */
   onCreate = () => {
     const { onCreateFail, config } = this.props;
-    Taro.showLoading({ mask: true, title: '生成中...' });
-    console.debug('-----start to download images---')
-      return this.downloadResourceTransit()
+    Taro.showLoading({ mask: true, title: "生成中..." });
+    console.debug("-----start to download images---");
+    return this.downloadResourceTransit()
       .then(() => {
-        console.debug('-----finish download images---')
+        console.debug("-----finish download images---");
         this.create(config);
       })
-      .catch((err) => {
+      .catch(err => {
         Taro.hideLoading();
-        Taro.showToast({ icon: 'none', title: err.message || err.errMsg || '下载图片失败' });
+        Taro.showToast({
+          icon: "none",
+          title: err.message || err.errMsg || "下载图片失败"
+        });
         console.error(err);
         if (!onCreateFail) {
-          console.warn('您必须实现 taro-plugin-canvas 组件的 onCreateFail 方法，详见文档 https://github.com/chuyun/taro-plugin-canvas#fail');
+          console.warn(
+            "您必须实现 taro-plugin-canvas 组件的 onCreateFail 方法，详见文档 https://github.com/chuyun/taro-plugin-canvas#fail"
+          );
         }
         onCreateFail && onCreateFail(err);
-      })
-  }
+      });
+  };
 
   /**
    * @param  { object } config
    */
-  create = (config) => {
-    console.debug('-----create canvas---', this.canvasId, this.$scope)
+  create = config => {
+    console.debug("-----create canvas---", this.canvasId, this.$scope);
     this.ctx = Taro.createCanvasContext(this.canvasId, this.$scope);
-    console.debug('-----finish create canvas---')
+    console.debug("-----finish create canvas---");
     const height = getHeight(config);
-    console.debug('-----ready to init canvas---')
+    console.debug("-----ready to init canvas---");
     this.initCanvas(config.width, height, config.debug)
       .then(() => {
-        console.debug('-----finish init canvas---')
+        console.debug("-----finish init canvas---");
         // 设置画布底色
         if (config.backgroundColor) {
           this.ctx.save();
@@ -200,107 +208,119 @@ export default class CanvasDrawer extends Component {
           texts = [],
           // images = [],
           blocks = [],
-          lines = [],
+          lines = []
         } = config;
         const queue = this.drawArr
-          .concat(texts.map((item) => {
-            item.type = 'text';
-            item.zIndex = item.zIndex || 0;
-            return item;
-          }))
-          .concat(blocks.map((item) => {
-            item.type = 'block';
-            item.zIndex = item.zIndex || 0;
-            return item;
-          }))
-          .concat(lines.map((item) => {
-            item.type = 'line';
-            item.zIndex = item.zIndex || 0;
-            return item;
-          }));
+          .concat(
+            texts.map(item => {
+              item.type = "text";
+              item.zIndex = item.zIndex || 0;
+              return item;
+            })
+          )
+          .concat(
+            blocks.map(item => {
+              item.type = "block";
+              item.zIndex = item.zIndex || 0;
+              return item;
+            })
+          )
+          .concat(
+            lines.map(item => {
+              item.type = "line";
+              item.zIndex = item.zIndex || 0;
+              return item;
+            })
+          );
         // 按照顺序排序
         queue.sort((a, b) => a.zIndex - b.zIndex);
 
-        queue.forEach((item) => {
+        queue.forEach(item => {
           let drawOptions = {
             ctx: this.ctx,
             toPx: this.toPx,
-            toRpx: this.toRpx,
-          }
-          if (item.type === 'image') {
-            drawImage(item,drawOptions)
-          } else if (item.type === 'text') {
-            drawText(item,drawOptions)
-          } else if (item.type === 'block') {
-            drawBlock(item,drawOptions)
-          } else if (item.type === 'line') {
-            drawLine(item,drawOptions)
+            toRpx: this.toRpx
+          };
+          if (item.type === "image") {
+            drawImage(item, drawOptions);
+          } else if (item.type === "text") {
+            drawText(item, drawOptions);
+          } else if (item.type === "block") {
+            drawBlock(item, drawOptions);
+          } else if (item.type === "line") {
+            drawLine(item, drawOptions);
           }
         });
 
         const res = Taro.getSystemInfoSync();
         const platform = res.platform;
         let time = 0;
-        if (platform === 'android') {
+        if (platform === "android") {
           // 在安卓平台，经测试发现如果海报过于复杂在转换时需要做延时，要不然样式会错乱
           time = 300;
         }
-        console.debug('-----start to draw---')
+        console.debug("-----start to draw---");
         this.ctx.draw(false, () => {
-          console.debug('-----finish draw---')
+          console.debug("-----finish draw---");
           setTimeout(() => {
-            console.debug('-----ready to read file---')
+            console.debug("-----ready to read file---");
             this.getTempFile();
           }, time);
         });
       })
-      .catch((err) => {
-        Taro.showToast({ icon: 'none', title: err.errMsg || '生成失败' });
+      .catch(err => {
+        Taro.showToast({ icon: "none", title: err.errMsg || "生成失败" });
         console.error(err);
       });
-  }
+  };
 
-  getTempFile = (otherOptions) => {
+  getTempFile = otherOptions => {
     const { onCreateSuccess, onCreateFail } = this.props;
-    Taro.canvasToTempFilePath({
-      canvasId: this.canvasId,
-      success: (result) => {
-        console.debug('-----read file success---')
-        if (!onCreateSuccess) {
-          console.warn('您必须实现 taro-plugin-canvas 组件的 onCreateSuccess 方法，详见文档 https://github.com/chuyun/taro-plugin-canvas#success');
-        }
-        onCreateSuccess && onCreateSuccess(result);
-      },
-      fail: (error) => {
-        const { errMsg } = error;
-        console.log(errMsg)
-        if (errMsg === 'canvasToTempFilePath:fail:create bitmap failed') {
-          count += 1;
-          if (count <= 3) {
-            this.getTempFile(otherOptions);
-          } else {
-            if (!onCreateFail) {
-              console.warn('您必须实现 taro-plugin-canvas 组件的 onCreateFail 方法，详见文档 https://github.com/chuyun/taro-plugin-canvas#fail');
+    Taro.canvasToTempFilePath(
+      {
+        canvasId: this.canvasId,
+        success: result => {
+          console.debug("-----read file success---");
+          if (!onCreateSuccess) {
+            console.warn(
+              "您必须实现 taro-plugin-canvas 组件的 onCreateSuccess 方法，详见文档 https://github.com/chuyun/taro-plugin-canvas#success"
+            );
+          }
+          onCreateSuccess && onCreateSuccess(result);
+        },
+        fail: error => {
+          const { errMsg } = error;
+          console.log(errMsg);
+          if (errMsg === "canvasToTempFilePath:fail:create bitmap failed") {
+            count += 1;
+            if (count <= 3) {
+              this.getTempFile(otherOptions);
+            } else {
+              if (!onCreateFail) {
+                console.warn(
+                  "您必须实现 taro-plugin-canvas 组件的 onCreateFail 方法，详见文档 https://github.com/chuyun/taro-plugin-canvas#fail"
+                );
+              }
+              onCreateFail && onCreateFail(error);
             }
-            onCreateFail && onCreateFail(error);
           }
         }
       },
-    }, this.$scope);
-  }
+      this.$scope
+    );
+  };
 
   render() {
     const { pxWidth, pxHeight, debug } = this.state;
-    if(pxWidth && pxHeight){
+    if (pxWidth && pxHeight) {
       return (
         <Canvas
           canvas-id={this.canvasId}
           style={`width:${pxWidth}px; height:${pxHeight}px;`}
-          className={`${debug ? 'debug' : 'pro'} canvas`}
+          className={`${debug ? "debug" : "pro"} canvas`}
         />
       );
     }
     return null;
   }
 }
-

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,8 +510,7 @@ export default class Index extends Component {
       `${originURL.origin}${originURL.path}?${queryString}`,
       originURL.hash
     ].join("#");
-    console.log(webURL, "webURLwebURLwebURLwebURLwebURLwebURLwebURLwebURLwebURLwebURLwebURL")
-
+    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',

src/utils/tools.js

@@ -215,8 +215,10 @@ export function parseQueryString(queryString) {
 }
 
 export function toQueryString(o) {
-  const obj = o || {}
-  return Object.keys(obj).map(key => `${key}=${obj[key]}`).join('&');
+  const obj = o || {};
+  return Object.keys(obj)
+    .map(key => `${key}=${obj[key]}`)
+    .join("&");
 }
 
 /**
@@ -264,7 +266,9 @@ export function getDownloadURL(url, type) {
 
   switch (type) {
     case "avatar":
-      return url.replace("https://wx.qlogo.cn/", `${HOST}/qlogo/`);
+      return url
+        .replace("https://wx.qlogo.cn/", `${HOST}/qlogo/`)
+        .replace("https://thirdwx.qlogo.cn/", `${HOST}/thirdwx/`);
     case "alioss":
       return url
         .replace(ossPath, `${HOST}/alioss/`)
@@ -302,7 +306,7 @@ export function throttle(callback, time = 500) {
   }
 }
 
-export const wait = function (time = 500) {
+export const wait = function(time = 500) {
   return new Promise(res => {
     setTimeout(() => {
       res();
@@ -310,7 +314,7 @@ export const wait = function (time = 500) {
   });
 };
 
-export const getQueryString = function (str, name) {
+export const getQueryString = function(str, name) {
   var regex = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
   var r = str.match(regex);
   if (r != null) return unescape(r[2]);
@@ -356,10 +360,10 @@ export const makeProjectPoster = res => {
         ctx.strokeStyle = "#ffffff";
         ctx.clip(); //裁剪上面的圆形
         ctx.drawImage(list[2].tempFilePath, 46, 856, 100, 100);
-        ctx.draw(false, function () {
+        ctx.draw(false, function() {
           Taro.canvasToTempFilePath({
             canvasId: canvasName,
-            success: function ({ tempFilePath }) {
+            success: function({ tempFilePath }) {
               resolve(tempFilePath);
             }
           });
@@ -368,9 +372,9 @@ export const makeProjectPoster = res => {
       .catch(err => {
         rtLog.error(
           "下载图片失败, 图片地址 (" +
-          `${_poster} , ${qrcode}, ${_avatarurl}` +
-          "), 错误消息: " +
-          (err.message || err.errMsg || err)
+            `${_poster} , ${qrcode}, ${_avatarurl}` +
+            "), 错误消息: " +
+            (err.message || err.errMsg || err)
         );
       });
   });
@@ -394,11 +398,11 @@ export const removeLocalFile = callback => {
 export const canvasToTempFilePath = (canvasName, callback) => {
   Taro.canvasToTempFilePath({
     canvasId: canvasName,
-    success: function (data) {
+    success: function(data) {
       var tempFilePath = data.tempFilePath;
       callback(tempFilePath);
     },
-    fail: function (res) {
+    fail: function(res) {
       console.log(res);
     }
   });
@@ -412,7 +416,7 @@ export const saveFile = (tempFilePath, callback) => {
       console.log("成功" + res1.savedFilePath);
       callback(res1.savedFilePath);
     },
-    fail: function (res) {
+    fail: function(res) {
       console.log("失败");
     }
   });
@@ -421,12 +425,12 @@ export const saveFile = (tempFilePath, callback) => {
 export const downloadFile = (imgUrl, callback) => {
   Taro.downloadFile({
     url: imgUrl,
-    success: function (param) {
+    success: function(param) {
       if (param.statusCode === 200) {
         callback(param);
       }
     },
-    fail: function (res) {
+    fail: function(res) {
       console.log("生成失败请稍候重试");
     }
   });
@@ -533,10 +537,10 @@ export const makeCardPoster = data => {
       ctx.strokeStyle = "#ffffff";
       ctx.clip();
       ctx.drawImage(list[1].tempFilePath, 50, 0, 400, 400, 249, 610, 130, 130);
-      ctx.draw(false, function () {
+      ctx.draw(false, function() {
         Taro.canvasToTempFilePath({
           canvasId: canvasName,
-          success: function ({ tempFilePath }) {
+          success: function({ tempFilePath }) {
             resolve(tempFilePath);
           }
         });
@@ -608,7 +612,7 @@ export const makeCardShareImg = data => {
       ctx.clip(); //裁剪上面的圆形
       ctx.drawImage(list[0].tempFilePath, 450, 100, 200, 200, 400, 100);
 
-      ctx.draw(false, function () {
+      ctx.draw(false, function() {
         Taro.canvasToTempFilePath({ canvasId: canvasName, quality: 1 }).then(
           ({ tempFilePath }) => {
             resolve(tempFilePath);
@@ -619,13 +623,13 @@ export const makeCardShareImg = data => {
   });
 };
 
-export const isObject = function (value) {
+export const isObject = function(value) {
   var type = typeof value;
   return value != null && type === "object";
 };
 
 //使用递归的方式实现数组、对象的深拷贝
-export const deepClone = function (obj) {
+export const deepClone = function(obj) {
   if (!isObject(obj)) {
     throw new Error("obj 不是一个对象！");
   }
@@ -638,7 +642,7 @@ export const deepClone = function (obj) {
   return cloneObj;
 };
 
-export const validateAuth = function (name, callback) {
+export const validateAuth = function(name, callback) {
   Taro.getSetting().then(res => {
     const hasAuth = res.authSetting[name];
     if (hasAuth) {
@@ -656,7 +660,7 @@ export const validateAuth = function (name, callback) {
  * @param strict 是否严格模式
  * @returns `phoneNumber` 是中国的手机号码返回 `true`，否则返回 `false`
  */
-export const isChineseMobilePhoneNumber = function (phoneNumber, strict) {
+export const isChineseMobilePhoneNumber = function(phoneNumber, strict) {
   if (strict === undefined) {
     strict = false;
   }
@@ -673,7 +677,7 @@ export const isChineseMobilePhoneNumber = function (phoneNumber, strict) {
  * @returns `value` 是邮件地址返回 `true`，否则返回 `false`
  * @see http://emailregex.com/
  */
-export const isEmail = function (value) {
+export const isEmail = function(value) {
   var re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
   return re.test(value);
 };