diff --git a/.gitignore b/.gitignore
index 07fb17e..723898b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /unpackage
 /.hbuilderx
 /.idea
+/node_modules/
diff --git a/common/js/checkUpdater.js b/common/js/checkUpdater.js
new file mode 100644
index 0000000..2ecab14
--- /dev/null
+++ b/common/js/checkUpdater.js
@@ -0,0 +1,124 @@
+import Config from './config.js';
+export function checkUpdater(currentId, updaterPage) {
+    uni.request({
+        url: Config.baseUrl+'/api/version/id',
+        method: 'GET',
+        data: {
+            search: 'latestId'
+        },
+        success: res => {
+            if (res.statusCode === 200) {
+                const response = res.data
+                const latestId = response.latest.id
+                const method = response.latest.method
+                if (!latestId) {
+                    console.log('当前没有发行版本')
+                } else if (currentId != latestId && method === 'force') {
+                    console.log('确认强制更新，正在取得地址')
+                    //  如果需要背地（静默）热更新，获取下载地址
+                    uni.request({
+                        url: Config.baseUrl+'/api/version/info',
+                        method: 'GET',
+                        data: {
+                          search: 'latestInfo'
+                        },
+                        success: (res) => {
+                            if (res.statusCode === 200) {
+                                console.log('地址请求成功')
+                                const response = res.data
+                                const iosLink = response.latest.info.iosLink
+                                const androidLink = response.latest.info.androidLink
+                                let downloadLink = ''
+                                let ready = false
+                                // 判断系统类型
+                                if (plus.os.name.toLowerCase() === 'android') {
+                                    console.log('安卓系统')
+                                    if (androidLink && androidLink !== '#') { // 我这里默认#也是没有地址，请根据业务自行修改
+                                        console.log('发现下载地址')
+                                        // 安卓：创建下载任务
+                                        if (androidLink.match(RegExp(/.wgt/))) {
+                                            console.log('确认wgt热更新包')
+                                            downloadLink = androidLink
+                                            ready = true
+                                        } else {
+                                            console.log('安卓推荐.wgt强制更新，.apk的强制更新请您自行修改程序')
+                                        }
+                                    } else {
+                                        console.log('下载地址是空的，无法继续')
+                                    }
+                                } else {
+                                    console.log('苹果系统')
+                                    if (iosLink && iosLink !== '#') { // 我这里默认#也是没有地址，请根据业务自行修改
+                                        console.log('发现下载地址')
+                                        // 苹果(A)：进行热更新（如果iosLink是wgt更新包的下载地址）判断文件名中是否含有.wgt
+                                        if (iosLink.match(RegExp(/.wgt/))) {
+                                            console.log('确认wgt热更新包')
+                                            downloadLink = iosLink
+                                            ready = true
+                                        } else {
+                                            console.log('苹果只支持.wgt强制更新')
+                                        }
+                                    } else {
+                                        console.log('下载地址是空的，无法继续')
+                                    }
+                                }
+                                if (ready) {
+                                    console.log('任务开始')
+                                    let downloadTask = uni.downloadFile({
+                                        url: downloadLink,
+                                        success: (res) => {
+                                            if (res.statusCode === 200) {
+                                                // 保存下载的安装包
+                                                console.log('保存安装包')
+                                                uni.saveFile({
+                                                    tempFilePath: res.tempFilePath,
+                                                    success: (res) => {
+                                                        const packgePath = res.savedFilePath
+                                                        // 保存更新记录到stroage，下次启动app时安装更新
+                                                        uni.setStorage({
+                                                            key: 'updated',
+                                                            data: {
+                                                                completed: false,
+                                                                packgePath: packgePath
+                                                            },
+                                                            success: () => {
+                                                                console.log('成功保存记录')
+                                                            }
+                                                        }) 
+                                                        // 任务完成，关闭下载任务
+                                                        console.log('任务完成，关闭下载任务，下一次启动应用时将安装更新')
+                                                        downloadTask.abort()
+                                                        downloadTask = null
+                                                    }
+                                                })
+                                            }
+                                        }
+                                    })
+                                } else {
+                                    console.log('下载地址未准备，无法开启下载任务')
+                                }             
+                            }
+                        }
+                    })
+                } else if (currentId != latestId) {
+                    console.log('检测到更新')
+                    uni.showModal({
+                        title: '发现新版本',
+                        content: '有新版本可用 (版本id:' + latestId + ')，请问您是否更新？',
+                        success: (res) => {
+                            if (res.confirm) {
+                                uni.navigateTo({
+                                    url: updaterPage
+                                })										
+                            } else if (res.cancel) {
+                                console.log('取消')
+                            }
+                        }
+                    })
+                } else {
+                    console.log('现在是最新版本')
+                }      
+            }
+        }
+    })
+}
\ No newline at end of file
diff --git a/common/js/uni-copy.js b/common/js/uni-copy.js
new file mode 100644
index 0000000..6ceb604
--- /dev/null
+++ b/common/js/uni-copy.js
@@ -0,0 +1,42 @@
+export default function uniCopy({content,success,error}) {
+	if(!content) return error('复制的内容不能为空 !')
+	content = typeof content === 'string' ? content : content.toString() // 复制内容，必须字符串，数字需要转换为字符串
+	/**
+	 * 小程序端 和 app端的复制逻辑
+	 */
+	//#ifndef H5
+	uni.setClipboardData({
+		data: content,
+		success: function() {
+			success("复制成功~")
+			console.log('success');
+		},
+		fail:function(){
+			success("复制失败~")
+		}
+	});
+	//#endif
+	
+	/**
+	 * H5端的复制逻辑
+	 */
+	// #ifdef H5
+	if (!document.queryCommandSupported('copy')) { //为了兼容有些浏览器 queryCommandSupported 的判断
+		// 不支持
+		error('浏览器不支持')
+	}
+	let textarea = document.createElement("textarea")
+	textarea.value = content
+	textarea.readOnly = "readOnly"
+	document.body.appendChild(textarea)
+	textarea.select() // 选择对象
+	textarea.setSelectionRange(0, content.length) //核心
+	let result = document.execCommand("copy") // 执行浏览器复制命令
+	if(result){
+		success("复制成功~")
+	}else{
+		error("复制失败，请检查h5中调用该方法的方式，是不是用户点击的方式调用的，如果不是请改为用户点击的方式触发该方法，因为h5中安全性，不能js直接调用！")
+	}	
+	textarea.remove()
+	// #endif
+}
diff --git a/common/js/uqrcode.js b/common/js/uqrcode.js
new file mode 100644
index 0000000..521c7a4
--- /dev/null
+++ b/common/js/uqrcode.js
@@ -0,0 +1,1439 @@
+// uqrcode.js
+//---------------------------------------------------------------------
+// github https://github.com/Sansnn/uQRCode
+//---------------------------------------------------------------------
+
+let uQRCode = {};
+
+(function() {
+  //---------------------------------------------------------------------
+  // QRCode for JavaScript
+  //
+  // Copyright (c) 2009 Kazuhiko Arase
+  //
+  // URL: http://www.d-project.com/
+  //
+  // Licensed under the MIT license:
+  //   http://www.opensource.org/licenses/mit-license.php
+  //
+  // The word "QR Code" is registered trademark of
+  // DENSO WAVE INCORPORATED
+  //   http://www.denso-wave.com/qrcode/faqpatent-e.html
+  //
+  //---------------------------------------------------------------------
+
+  //---------------------------------------------------------------------
+  // QR8bitByte
+  //---------------------------------------------------------------------
+
+  function QR8bitByte(data) {
+    this.mode = QRMode.MODE_8BIT_BYTE;
+    this.data = data;
+  }
+
+  QR8bitByte.prototype = {
+
+    getLength: function(buffer) {
+      return this.data.length;
+    },
+
+    write: function(buffer) {
+      for (var i = 0; i < this.data.length; i++) {
+        // not JIS ...
+        buffer.put(this.data.charCodeAt(i), 8);
+      }
+    }
+  };
+
+  //---------------------------------------------------------------------
+  // QRCode
+  //---------------------------------------------------------------------
+
+  function QRCode(typeNumber, errorCorrectLevel) {
+    this.typeNumber = typeNumber;
+    this.errorCorrectLevel = errorCorrectLevel;
+    this.modules = null;
+    this.moduleCount = 0;
+    this.dataCache = null;
+    this.dataList = new Array();
+  }
+
+  QRCode.prototype = {
+
+    addData: function(data) {
+      var newData = new QR8bitByte(data);
+      this.dataList.push(newData);
+      this.dataCache = null;
+    },
+
+    isDark: function(row, col) {
+      if (row < 0 || this.moduleCount <= row || col < 0 || this.moduleCount <= col) {
+        throw new Error(row + "," + col);
+      }
+      return this.modules[row][col];
+    },
+
+    getModuleCount: function() {
+      return this.moduleCount;
+    },
+
+    make: function() {
+      // Calculate automatically typeNumber if provided is < 1
+      if (this.typeNumber < 1) {
+        var typeNumber = 1;
+        for (typeNumber = 1; typeNumber < 40; typeNumber++) {
+          var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, this.errorCorrectLevel);
+
+          var buffer = new QRBitBuffer();
+          var totalDataCount = 0;
+          for (var i = 0; i < rsBlocks.length; i++) {
+            totalDataCount += rsBlocks[i].dataCount;
+          }
+
+          for (var i = 0; i < this.dataList.length; i++) {
+            var data = this.dataList[i];
+            buffer.put(data.mode, 4);
+            buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber));
+            data.write(buffer);
+          }
+          if (buffer.getLengthInBits() <= totalDataCount * 8)
+            break;
+        }
+        this.typeNumber = typeNumber;
+      }
+      this.makeImpl(false, this.getBestMaskPattern());
+    },
+
+    makeImpl: function(test, maskPattern) {
+
+      this.moduleCount = this.typeNumber * 4 + 17;
+      this.modules = new Array(this.moduleCount);
+
+      for (var row = 0; row < this.moduleCount; row++) {
+
+        this.modules[row] = new Array(this.moduleCount);
+
+        for (var col = 0; col < this.moduleCount; col++) {
+          this.modules[row][col] = null; //(col + row) % 3;
+        }
+      }
+
+      this.setupPositionProbePattern(0, 0);
+      this.setupPositionProbePattern(this.moduleCount - 7, 0);
+      this.setupPositionProbePattern(0, this.moduleCount - 7);
+      this.setupPositionAdjustPattern();
+      this.setupTimingPattern();
+      this.setupTypeInfo(test, maskPattern);
+
+      if (this.typeNumber >= 7) {
+        this.setupTypeNumber(test);
+      }
+
+      if (this.dataCache == null) {
+        this.dataCache = QRCode.createData(this.typeNumber, this.errorCorrectLevel, this.dataList);
+      }
+
+      this.mapData(this.dataCache, maskPattern);
+    },
+
+    setupPositionProbePattern: function(row, col) {
+
+      for (var r = -1; r <= 7; r++) {
+
+        if (row + r <= -1 || this.moduleCount <= row + r) continue;
+
+        for (var c = -1; c <= 7; c++) {
+
+          if (col + c <= -1 || this.moduleCount <= col + c) continue;
+
+          if ((0 <= r && r <= 6 && (c == 0 || c == 6)) ||
+            (0 <= c && c <= 6 && (r == 0 || r == 6)) ||
+            (2 <= r && r <= 4 && 2 <= c && c <= 4)) {
+            this.modules[row + r][col + c] = true;
+          } else {
+            this.modules[row + r][col + c] = false;
+          }
+        }
+      }
+    },
+
+    getBestMaskPattern: function() {
+
+      var minLostPoint = 0;
+      var pattern = 0;
+
+      for (var i = 0; i < 8; i++) {
+
+        this.makeImpl(true, i);
+
+        var lostPoint = QRUtil.getLostPoint(this);
+
+        if (i == 0 || minLostPoint > lostPoint) {
+          minLostPoint = lostPoint;
+          pattern = i;
+        }
+      }
+
+      return pattern;
+    },
+
+    createMovieClip: function(target_mc, instance_name, depth) {
+
+      var qr_mc = target_mc.createEmptyMovieClip(instance_name, depth);
+      var cs = 1;
+
+      this.make();
+
+      for (var row = 0; row < this.modules.length; row++) {
+
+        var y = row * cs;
+
+        for (var col = 0; col < this.modules[row].length; col++) {
+
+          var x = col * cs;
+          var dark = this.modules[row][col];
+
+          if (dark) {
+            qr_mc.beginFill(0, 100);
+            qr_mc.moveTo(x, y);
+            qr_mc.lineTo(x + cs, y);
+            qr_mc.lineTo(x + cs, y + cs);
+            qr_mc.lineTo(x, y + cs);
+            qr_mc.endFill();
+          }
+        }
+      }
+
+      return qr_mc;
+    },
+
+    setupTimingPattern: function() {
+
+      for (var r = 8; r < this.moduleCount - 8; r++) {
+        if (this.modules[r][6] != null) {
+          continue;
+        }
+        this.modules[r][6] = (r % 2 == 0);
+      }
+
+      for (var c = 8; c < this.moduleCount - 8; c++) {
+        if (this.modules[6][c] != null) {
+          continue;
+        }
+        this.modules[6][c] = (c % 2 == 0);
+      }
+    },
+
+    setupPositionAdjustPattern: function() {
+
+      var pos = QRUtil.getPatternPosition(this.typeNumber);
+
+      for (var i = 0; i < pos.length; i++) {
+
+        for (var j = 0; j < pos.length; j++) {
+
+          var row = pos[i];
+          var col = pos[j];
+
+          if (this.modules[row][col] != null) {
+            continue;
+          }
+
+          for (var r = -2; r <= 2; r++) {
+
+            for (var c = -2; c <= 2; c++) {
+
+              if (r == -2 || r == 2 || c == -2 || c == 2 ||
+                (r == 0 && c == 0)) {
+                this.modules[row + r][col + c] = true;
+              } else {
+                this.modules[row + r][col + c] = false;
+              }
+            }
+          }
+        }
+      }
+    },
+
+    setupTypeNumber: function(test) {
+
+      var bits = QRUtil.getBCHTypeNumber(this.typeNumber);
+
+      for (var i = 0; i < 18; i++) {
+        var mod = (!test && ((bits >> i) & 1) == 1);
+        this.modules[Math.floor(i / 3)][i % 3 + this.moduleCount - 8 - 3] = mod;
+      }
+
+      for (var i = 0; i < 18; i++) {
+        var mod = (!test && ((bits >> i) & 1) == 1);
+        this.modules[i % 3 + this.moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
+      }
+    },
+
+    setupTypeInfo: function(test, maskPattern) {
+
+      var data = (this.errorCorrectLevel << 3) | maskPattern;
+      var bits = QRUtil.getBCHTypeInfo(data);
+
+      // vertical
+      for (var i = 0; i < 15; i++) {
+
+        var mod = (!test && ((bits >> i) & 1) == 1);
+
+        if (i < 6) {
+          this.modules[i][8] = mod;
+        } else if (i < 8) {
+          this.modules[i + 1][8] = mod;
+        } else {
+          this.modules[this.moduleCount - 15 + i][8] = mod;
+        }
+      }
+
+      // horizontal
+      for (var i = 0; i < 15; i++) {
+
+        var mod = (!test && ((bits >> i) & 1) == 1);
+
+        if (i < 8) {
+          this.modules[8][this.moduleCount - i - 1] = mod;
+        } else if (i < 9) {
+          this.modules[8][15 - i - 1 + 1] = mod;
+        } else {
+          this.modules[8][15 - i - 1] = mod;
+        }
+      }
+
+      // fixed module
+      this.modules[this.moduleCount - 8][8] = (!test);
+
+    },
+
+    mapData: function(data, maskPattern) {
+
+      var inc = -1;
+      var row = this.moduleCount - 1;
+      var bitIndex = 7;
+      var byteIndex = 0;
+
+      for (var col = this.moduleCount - 1; col > 0; col -= 2) {
+
+        if (col == 6) col--;
+
+        while (true) {
+
+          for (var c = 0; c < 2; c++) {
+
+            if (this.modules[row][col - c] == null) {
+
+              var dark = false;
+
+              if (byteIndex < data.length) {
+                dark = (((data[byteIndex] >>> bitIndex) & 1) == 1);
+              }
+
+              var mask = QRUtil.getMask(maskPattern, row, col - c);
+
+              if (mask) {
+                dark = !dark;
+              }
+
+              this.modules[row][col - c] = dark;
+              bitIndex--;
+
+              if (bitIndex == -1) {
+                byteIndex++;
+                bitIndex = 7;
+              }
+            }
+          }
+
+          row += inc;
+
+          if (row < 0 || this.moduleCount <= row) {
+            row -= inc;
+            inc = -inc;
+            break;
+          }
+        }
+      }
+
+    }
+
+  };
+
+  QRCode.PAD0 = 0xEC;
+  QRCode.PAD1 = 0x11;
+
+  QRCode.createData = function(typeNumber, errorCorrectLevel, dataList) {
+
+    var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel);
+
+    var buffer = new QRBitBuffer();
+
+    for (var i = 0; i < dataList.length; i++) {
+      var data = dataList[i];
+      buffer.put(data.mode, 4);
+      buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber));
+      data.write(buffer);
+    }
+
+    // calc num max data.
+    var totalDataCount = 0;
+    for (var i = 0; i < rsBlocks.length; i++) {
+      totalDataCount += rsBlocks[i].dataCount;
+    }
+
+    if (buffer.getLengthInBits() > totalDataCount * 8) {
+      throw new Error("code length overflow. (" +
+        buffer.getLengthInBits() +
+        ">" +
+        totalDataCount * 8 +
+        ")");
+    }
+
+    // end code
+    if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) {
+      buffer.put(0, 4);
+    }
+
+    // padding
+    while (buffer.getLengthInBits() % 8 != 0) {
+      buffer.putBit(false);
+    }
+
+    // padding
+    while (true) {
+
+      if (buffer.getLengthInBits() >= totalDataCount * 8) {
+        break;
+      }
+      buffer.put(QRCode.PAD0, 8);
+
+      if (buffer.getLengthInBits() >= totalDataCount * 8) {
+        break;
+      }
+      buffer.put(QRCode.PAD1, 8);
+    }
+
+    return QRCode.createBytes(buffer, rsBlocks);
+  }
+
+  QRCode.createBytes = function(buffer, rsBlocks) {
+
+    var offset = 0;
+
+    var maxDcCount = 0;
+    var maxEcCount = 0;
+
+    var dcdata = new Array(rsBlocks.length);
+    var ecdata = new Array(rsBlocks.length);
+
+    for (var r = 0; r < rsBlocks.length; r++) {
+
+      var dcCount = rsBlocks[r].dataCount;
+      var ecCount = rsBlocks[r].totalCount - dcCount;
+
+      maxDcCount = Math.max(maxDcCount, dcCount);
+      maxEcCount = Math.max(maxEcCount, ecCount);
+
+      dcdata[r] = new Array(dcCount);
+
+      for (var i = 0; i < dcdata[r].length; i++) {
+        dcdata[r][i] = 0xff & buffer.buffer[i + offset];
+      }
+      offset += dcCount;
+
+      var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount);
+      var rawPoly = new QRPolynomial(dcdata[r], rsPoly.getLength() - 1);
+
+      var modPoly = rawPoly.mod(rsPoly);
+      ecdata[r] = new Array(rsPoly.getLength() - 1);
+      for (var i = 0; i < ecdata[r].length; i++) {
+        var modIndex = i + modPoly.getLength() - ecdata[r].length;
+        ecdata[r][i] = (modIndex >= 0) ? modPoly.get(modIndex) : 0;
+      }
+
+    }
+
+    var totalCodeCount = 0;
+    for (var i = 0; i < rsBlocks.length; i++) {
+      totalCodeCount += rsBlocks[i].totalCount;
+    }
+
+    var data = new Array(totalCodeCount);
+    var index = 0;
+
+    for (var i = 0; i < maxDcCount; i++) {
+      for (var r = 0; r < rsBlocks.length; r++) {
+        if (i < dcdata[r].length) {
+          data[index++] = dcdata[r][i];
+        }
+      }
+    }
+
+    for (var i = 0; i < maxEcCount; i++) {
+      for (var r = 0; r < rsBlocks.length; r++) {
+        if (i < ecdata[r].length) {
+          data[index++] = ecdata[r][i];
+        }
+      }
+    }
+
+    return data;
+
+  }
+
+  //---------------------------------------------------------------------
+  // QRMode
+  //---------------------------------------------------------------------
+
+  var QRMode = {
+    MODE_NUMBER: 1 << 0,
+    MODE_ALPHA_NUM: 1 << 1,
+    MODE_8BIT_BYTE: 1 << 2,
+    MODE_KANJI: 1 << 3
+  };
+
+  //---------------------------------------------------------------------
+  // QRErrorCorrectLevel
+  //---------------------------------------------------------------------
+
+  var QRErrorCorrectLevel = {
+    L: 1,
+    M: 0,
+    Q: 3,
+    H: 2
+  };
+
+  //---------------------------------------------------------------------
+  // QRMaskPattern
+  //---------------------------------------------------------------------
+
+  var QRMaskPattern = {
+    PATTERN000: 0,
+    PATTERN001: 1,
+    PATTERN010: 2,
+    PATTERN011: 3,
+    PATTERN100: 4,
+    PATTERN101: 5,
+    PATTERN110: 6,
+    PATTERN111: 7
+  };
+
+  //---------------------------------------------------------------------
+  // QRUtil
+  //---------------------------------------------------------------------
+
+  var QRUtil = {
+
+    PATTERN_POSITION_TABLE: [
+      [],
+      [6, 18],
+      [6, 22],
+      [6, 26],
+      [6, 30],
+      [6, 34],
+      [6, 22, 38],
+      [6, 24, 42],
+      [6, 26, 46],
+      [6, 28, 50],
+      [6, 30, 54],
+      [6, 32, 58],
+      [6, 34, 62],
+      [6, 26, 46, 66],
+      [6, 26, 48, 70],
+      [6, 26, 50, 74],
+      [6, 30, 54, 78],
+      [6, 30, 56, 82],
+      [6, 30, 58, 86],
+      [6, 34, 62, 90],
+      [6, 28, 50, 72, 94],
+      [6, 26, 50, 74, 98],
+      [6, 30, 54, 78, 102],
+      [6, 28, 54, 80, 106],
+      [6, 32, 58, 84, 110],
+      [6, 30, 58, 86, 114],
+      [6, 34, 62, 90, 118],
+      [6, 26, 50, 74, 98, 122],
+      [6, 30, 54, 78, 102, 126],
+      [6, 26, 52, 78, 104, 130],
+      [6, 30, 56, 82, 108, 134],
+      [6, 34, 60, 86, 112, 138],
+      [6, 30, 58, 86, 114, 142],
+      [6, 34, 62, 90, 118, 146],
+      [6, 30, 54, 78, 102, 126, 150],
+      [6, 24, 50, 76, 102, 128, 154],
+      [6, 28, 54, 80, 106, 132, 158],
+      [6, 32, 58, 84, 110, 136, 162],
+      [6, 26, 54, 82, 110, 138, 166],
+      [6, 30, 58, 86, 114, 142, 170]
+    ],
+
+    G15: (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0),
+    G18: (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0),
+    G15_MASK: (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1),
+
+    getBCHTypeInfo: function(data) {
+      var d = data << 10;
+      while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) >= 0) {
+        d ^= (QRUtil.G15 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15)));
+      }
+      return ((data << 10) | d) ^ QRUtil.G15_MASK;
+    },
+
+    getBCHTypeNumber: function(data) {
+      var d = data << 12;
+      while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) >= 0) {
+        d ^= (QRUtil.G18 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18)));
+      }
+      return (data << 12) | d;
+    },
+
+    getBCHDigit: function(data) {
+
+      var digit = 0;
+
+      while (data != 0) {
+        digit++;
+        data >>>= 1;
+      }
+
+      return digit;
+    },
+
+    getPatternPosition: function(typeNumber) {
+      return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1];
+    },
+
+    getMask: function(maskPattern, i, j) {
+
+      switch (maskPattern) {
+
+        case QRMaskPattern.PATTERN000:
+          return (i + j) % 2 == 0;
+        case QRMaskPattern.PATTERN001:
+          return i % 2 == 0;
+        case QRMaskPattern.PATTERN010:
+          return j % 3 == 0;
+        case QRMaskPattern.PATTERN011:
+          return (i + j) % 3 == 0;
+        case QRMaskPattern.PATTERN100:
+          return (Math.floor(i / 2) + Math.floor(j / 3)) % 2 == 0;
+        case QRMaskPattern.PATTERN101:
+          return (i * j) % 2 + (i * j) % 3 == 0;
+        case QRMaskPattern.PATTERN110:
+          return ((i * j) % 2 + (i * j) % 3) % 2 == 0;
+        case QRMaskPattern.PATTERN111:
+          return ((i * j) % 3 + (i + j) % 2) % 2 == 0;
+
+        default:
+          throw new Error("bad maskPattern:" + maskPattern);
+      }
+    },
+
+    getErrorCorrectPolynomial: function(errorCorrectLength) {
+
+      var a = new QRPolynomial([1], 0);
+
+      for (var i = 0; i < errorCorrectLength; i++) {
+        a = a.multiply(new QRPolynomial([1, QRMath.gexp(i)], 0));
+      }
+
+      return a;
+    },
+
+    getLengthInBits: function(mode, type) {
+
+      if (1 <= type && type < 10) {
+
+        // 1 - 9
+
+        switch (mode) {
+          case QRMode.MODE_NUMBER:
+            return 10;
+          case QRMode.MODE_ALPHA_NUM:
+            return 9;
+          case QRMode.MODE_8BIT_BYTE:
+            return 8;
+          case QRMode.MODE_KANJI:
+            return 8;
+          default:
+            throw new Error("mode:" + mode);
+        }
+
+      } else if (type < 27) {
+
+        // 10 - 26
+
+        switch (mode) {
+          case QRMode.MODE_NUMBER:
+            return 12;
+          case QRMode.MODE_ALPHA_NUM:
+            return 11;
+          case QRMode.MODE_8BIT_BYTE:
+            return 16;
+          case QRMode.MODE_KANJI:
+            return 10;
+          default:
+            throw new Error("mode:" + mode);
+        }
+
+      } else if (type < 41) {
+
+        // 27 - 40
+
+        switch (mode) {
+          case QRMode.MODE_NUMBER:
+            return 14;
+          case QRMode.MODE_ALPHA_NUM:
+            return 13;
+          case QRMode.MODE_8BIT_BYTE:
+            return 16;
+          case QRMode.MODE_KANJI:
+            return 12;
+          default:
+            throw new Error("mode:" + mode);
+        }
+
+      } else {
+        throw new Error("type:" + type);
+      }
+    },
+
+    getLostPoint: function(qrCode) {
+
+      var moduleCount = qrCode.getModuleCount();
+
+      var lostPoint = 0;
+
+      // LEVEL1
+
+      for (var row = 0; row < moduleCount; row++) {
+
+        for (var col = 0; col < moduleCount; col++) {
+
+          var sameCount = 0;
+          var dark = qrCode.isDark(row, col);
+
+          for (var r = -1; r <= 1; r++) {
+
+            if (row + r < 0 || moduleCount <= row + r) {
+              continue;
+            }
+
+            for (var c = -1; c <= 1; c++) {
+
+              if (col + c < 0 || moduleCount <= col + c) {
+                continue;
+              }
+
+              if (r == 0 && c == 0) {
+                continue;
+              }
+
+              if (dark == qrCode.isDark(row + r, col + c)) {
+                sameCount++;
+              }
+            }
+          }
+
+          if (sameCount > 5) {
+            lostPoint += (3 + sameCount - 5);
+          }
+        }
+      }
+
+      // LEVEL2
+
+      for (var row = 0; row < moduleCount - 1; row++) {
+        for (var col = 0; col < moduleCount - 1; col++) {
+          var count = 0;
+          if (qrCode.isDark(row, col)) count++;
+          if (qrCode.isDark(row + 1, col)) count++;
+          if (qrCode.isDark(row, col + 1)) count++;
+          if (qrCode.isDark(row + 1, col + 1)) count++;
+          if (count == 0 || count == 4) {
+            lostPoint += 3;
+          }
+        }
+      }
+
+      // LEVEL3
+
+      for (var row = 0; row < moduleCount; row++) {
+        for (var col = 0; col < moduleCount - 6; col++) {
+          if (qrCode.isDark(row, col) &&
+            !qrCode.isDark(row, col + 1) &&
+            qrCode.isDark(row, col + 2) &&
+            qrCode.isDark(row, col + 3) &&
+            qrCode.isDark(row, col + 4) &&
+            !qrCode.isDark(row, col + 5) &&
+            qrCode.isDark(row, col + 6)) {
+            lostPoint += 40;
+          }
+        }
+      }
+
+      for (var col = 0; col < moduleCount; col++) {
+        for (var row = 0; row < moduleCount - 6; row++) {
+          if (qrCode.isDark(row, col) &&
+            !qrCode.isDark(row + 1, col) &&
+            qrCode.isDark(row + 2, col) &&
+            qrCode.isDark(row + 3, col) &&
+            qrCode.isDark(row + 4, col) &&
+            !qrCode.isDark(row + 5, col) &&
+            qrCode.isDark(row + 6, col)) {
+            lostPoint += 40;
+          }
+        }
+      }
+
+      // LEVEL4
+
+      var darkCount = 0;
+
+      for (var col = 0; col < moduleCount; col++) {
+        for (var row = 0; row < moduleCount; row++) {
+          if (qrCode.isDark(row, col)) {
+            darkCount++;
+          }
+        }
+      }
+
+      var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5;
+      lostPoint += ratio * 10;
+
+      return lostPoint;
+    }
+
+  };
+
+
+  //---------------------------------------------------------------------
+  // QRMath
+  //---------------------------------------------------------------------
+
+  var QRMath = {
+
+    glog: function(n) {
+
+      if (n < 1) {
+        throw new Error("glog(" + n + ")");
+      }
+
+      return QRMath.LOG_TABLE[n];
+    },
+
+    gexp: function(n) {
+
+      while (n < 0) {
+        n += 255;
+      }
+
+      while (n >= 256) {
+        n -= 255;
+      }
+
+      return QRMath.EXP_TABLE[n];
+    },
+
+    EXP_TABLE: new Array(256),
+
+    LOG_TABLE: new Array(256)
+
+  };
+
+  for (var i = 0; i < 8; i++) {
+    QRMath.EXP_TABLE[i] = 1 << i;
+  }
+  for (var i = 8; i < 256; i++) {
+    QRMath.EXP_TABLE[i] = QRMath.EXP_TABLE[i - 4] ^
+      QRMath.EXP_TABLE[i - 5] ^
+      QRMath.EXP_TABLE[i - 6] ^
+      QRMath.EXP_TABLE[i - 8];
+  }
+  for (var i = 0; i < 255; i++) {
+    QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]] = i;
+  }
+
+  //---------------------------------------------------------------------
+  // QRPolynomial
+  //---------------------------------------------------------------------
+
+  function QRPolynomial(num, shift) {
+
+    if (num.length == undefined) {
+      throw new Error(num.length + "/" + shift);
+    }
+
+    var offset = 0;
+
+    while (offset < num.length && num[offset] == 0) {
+      offset++;
+    }
+
+    this.num = new Array(num.length - offset + shift);
+    for (var i = 0; i < num.length - offset; i++) {
+      this.num[i] = num[i + offset];
+    }
+  }
+
+  QRPolynomial.prototype = {
+
+    get: function(index) {
+      return this.num[index];
+    },
+
+    getLength: function() {
+      return this.num.length;
+    },
+
+    multiply: function(e) {
+
+      var num = new Array(this.getLength() + e.getLength() - 1);
+
+      for (var i = 0; i < this.getLength(); i++) {
+        for (var j = 0; j < e.getLength(); j++) {
+          num[i + j] ^= QRMath.gexp(QRMath.glog(this.get(i)) + QRMath.glog(e.get(j)));
+        }
+      }
+
+      return new QRPolynomial(num, 0);
+    },
+
+    mod: function(e) {
+
+      if (this.getLength() - e.getLength() < 0) {
+        return this;
+      }
+
+      var ratio = QRMath.glog(this.get(0)) - QRMath.glog(e.get(0));
+
+      var num = new Array(this.getLength());
+
+      for (var i = 0; i < this.getLength(); i++) {
+        num[i] = this.get(i);
+      }
+
+      for (var i = 0; i < e.getLength(); i++) {
+        num[i] ^= QRMath.gexp(QRMath.glog(e.get(i)) + ratio);
+      }
+
+      // recursive call
+      return new QRPolynomial(num, 0).mod(e);
+    }
+  };
+
+  //---------------------------------------------------------------------
+  // QRRSBlock
+  //---------------------------------------------------------------------
+
+  function QRRSBlock(totalCount, dataCount) {
+    this.totalCount = totalCount;
+    this.dataCount = dataCount;
+  }
+
+  QRRSBlock.RS_BLOCK_TABLE = [
+
+    // L
+    // M
+    // Q
+    // H
+
+    // 1
+    [1, 26, 19],
+    [1, 26, 16],
+    [1, 26, 13],
+    [1, 26, 9],
+
+    // 2
+    [1, 44, 34],
+    [1, 44, 28],
+    [1, 44, 22],
+    [1, 44, 16],
+
+    // 3
+    [1, 70, 55],
+    [1, 70, 44],
+    [2, 35, 17],
+    [2, 35, 13],
+
+    // 4
+    [1, 100, 80],
+    [2, 50, 32],
+    [2, 50, 24],
+    [4, 25, 9],
+
+    // 5
+    [1, 134, 108],
+    [2, 67, 43],
+    [2, 33, 15, 2, 34, 16],
+    [2, 33, 11, 2, 34, 12],
+
+    // 6
+    [2, 86, 68],
+    [4, 43, 27],
+    [4, 43, 19],
+    [4, 43, 15],
+
+    // 7
+    [2, 98, 78],
+    [4, 49, 31],
+    [2, 32, 14, 4, 33, 15],
+    [4, 39, 13, 1, 40, 14],
+
+    // 8
+    [2, 121, 97],
+    [2, 60, 38, 2, 61, 39],
+    [4, 40, 18, 2, 41, 19],
+    [4, 40, 14, 2, 41, 15],
+
+    // 9
+    [2, 146, 116],
+    [3, 58, 36, 2, 59, 37],
+    [4, 36, 16, 4, 37, 17],
+    [4, 36, 12, 4, 37, 13],
+
+    // 10
+    [2, 86, 68, 2, 87, 69],
+    [4, 69, 43, 1, 70, 44],
+    [6, 43, 19, 2, 44, 20],
+    [6, 43, 15, 2, 44, 16],
+
+    // 11
+    [4, 101, 81],
+    [1, 80, 50, 4, 81, 51],
+    [4, 50, 22, 4, 51, 23],
+    [3, 36, 12, 8, 37, 13],
+
+    // 12
+    [2, 116, 92, 2, 117, 93],
+    [6, 58, 36, 2, 59, 37],
+    [4, 46, 20, 6, 47, 21],
+    [7, 42, 14, 4, 43, 15],
+
+    // 13
+    [4, 133, 107],
+    [8, 59, 37, 1, 60, 38],
+    [8, 44, 20, 4, 45, 21],
+    [12, 33, 11, 4, 34, 12],
+
+    // 14
+    [3, 145, 115, 1, 146, 116],
+    [4, 64, 40, 5, 65, 41],
+    [11, 36, 16, 5, 37, 17],
+    [11, 36, 12, 5, 37, 13],
+
+    // 15
+    [5, 109, 87, 1, 110, 88],
+    [5, 65, 41, 5, 66, 42],
+    [5, 54, 24, 7, 55, 25],
+    [11, 36, 12],
+
+    // 16
+    [5, 122, 98, 1, 123, 99],
+    [7, 73, 45, 3, 74, 46],
+    [15, 43, 19, 2, 44, 20],
+    [3, 45, 15, 13, 46, 16],
+
+    // 17
+    [1, 135, 107, 5, 136, 108],
+    [10, 74, 46, 1, 75, 47],
+    [1, 50, 22, 15, 51, 23],
+    [2, 42, 14, 17, 43, 15],
+
+    // 18
+    [5, 150, 120, 1, 151, 121],
+    [9, 69, 43, 4, 70, 44],
+    [17, 50, 22, 1, 51, 23],
+    [2, 42, 14, 19, 43, 15],
+
+    // 19
+    [3, 141, 113, 4, 142, 114],
+    [3, 70, 44, 11, 71, 45],
+    [17, 47, 21, 4, 48, 22],
+    [9, 39, 13, 16, 40, 14],
+
+    // 20
+    [3, 135, 107, 5, 136, 108],
+    [3, 67, 41, 13, 68, 42],
+    [15, 54, 24, 5, 55, 25],
+    [15, 43, 15, 10, 44, 16],
+
+    // 21
+    [4, 144, 116, 4, 145, 117],
+    [17, 68, 42],
+    [17, 50, 22, 6, 51, 23],
+    [19, 46, 16, 6, 47, 17],
+
+    // 22
+    [2, 139, 111, 7, 140, 112],
+    [17, 74, 46],
+    [7, 54, 24, 16, 55, 25],
+    [34, 37, 13],
+
+    // 23
+    [4, 151, 121, 5, 152, 122],
+    [4, 75, 47, 14, 76, 48],
+    [11, 54, 24, 14, 55, 25],
+    [16, 45, 15, 14, 46, 16],
+
+    // 24
+    [6, 147, 117, 4, 148, 118],
+    [6, 73, 45, 14, 74, 46],
+    [11, 54, 24, 16, 55, 25],
+    [30, 46, 16, 2, 47, 17],
+
+    // 25
+    [8, 132, 106, 4, 133, 107],
+    [8, 75, 47, 13, 76, 48],
+    [7, 54, 24, 22, 55, 25],
+    [22, 45, 15, 13, 46, 16],
+
+    // 26
+    [10, 142, 114, 2, 143, 115],
+    [19, 74, 46, 4, 75, 47],
+    [28, 50, 22, 6, 51, 23],
+    [33, 46, 16, 4, 47, 17],
+
+    // 27
+    [8, 152, 122, 4, 153, 123],
+    [22, 73, 45, 3, 74, 46],
+    [8, 53, 23, 26, 54, 24],
+    [12, 45, 15, 28, 46, 16],
+
+    // 28
+    [3, 147, 117, 10, 148, 118],
+    [3, 73, 45, 23, 74, 46],
+    [4, 54, 24, 31, 55, 25],
+    [11, 45, 15, 31, 46, 16],
+
+    // 29
+    [7, 146, 116, 7, 147, 117],
+    [21, 73, 45, 7, 74, 46],
+    [1, 53, 23, 37, 54, 24],
+    [19, 45, 15, 26, 46, 16],
+
+    // 30
+    [5, 145, 115, 10, 146, 116],
+    [19, 75, 47, 10, 76, 48],
+    [15, 54, 24, 25, 55, 25],
+    [23, 45, 15, 25, 46, 16],
+
+    // 31
+    [13, 145, 115, 3, 146, 116],
+    [2, 74, 46, 29, 75, 47],
+    [42, 54, 24, 1, 55, 25],
+    [23, 45, 15, 28, 46, 16],
+
+    // 32
+    [17, 145, 115],
+    [10, 74, 46, 23, 75, 47],
+    [10, 54, 24, 35, 55, 25],
+    [19, 45, 15, 35, 46, 16],
+
+    // 33
+    [17, 145, 115, 1, 146, 116],
+    [14, 74, 46, 21, 75, 47],
+    [29, 54, 24, 19, 55, 25],
+    [11, 45, 15, 46, 46, 16],
+
+    // 34
+    [13, 145, 115, 6, 146, 116],
+    [14, 74, 46, 23, 75, 47],
+    [44, 54, 24, 7, 55, 25],
+    [59, 46, 16, 1, 47, 17],
+
+    // 35
+    [12, 151, 121, 7, 152, 122],
+    [12, 75, 47, 26, 76, 48],
+    [39, 54, 24, 14, 55, 25],
+    [22, 45, 15, 41, 46, 16],
+
+    // 36
+    [6, 151, 121, 14, 152, 122],
+    [6, 75, 47, 34, 76, 48],
+    [46, 54, 24, 10, 55, 25],
+    [2, 45, 15, 64, 46, 16],
+
+    // 37
+    [17, 152, 122, 4, 153, 123],
+    [29, 74, 46, 14, 75, 47],
+    [49, 54, 24, 10, 55, 25],
+    [24, 45, 15, 46, 46, 16],
+
+    // 38
+    [4, 152, 122, 18, 153, 123],
+    [13, 74, 46, 32, 75, 47],
+    [48, 54, 24, 14, 55, 25],
+    [42, 45, 15, 32, 46, 16],
+
+    // 39
+    [20, 147, 117, 4, 148, 118],
+    [40, 75, 47, 7, 76, 48],
+    [43, 54, 24, 22, 55, 25],
+    [10, 45, 15, 67, 46, 16],
+
+    // 40
+    [19, 148, 118, 6, 149, 119],
+    [18, 75, 47, 31, 76, 48],
+    [34, 54, 24, 34, 55, 25],
+    [20, 45, 15, 61, 46, 16]
+  ];
+
+  QRRSBlock.getRSBlocks = function(typeNumber, errorCorrectLevel) {
+
+    var rsBlock = QRRSBlock.getRsBlockTable(typeNumber, errorCorrectLevel);
+
+    if (rsBlock == undefined) {
+      throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + errorCorrectLevel);
+    }
+
+    var length = rsBlock.length / 3;
+
+    var list = new Array();
+
+    for (var i = 0; i < length; i++) {
+
+      var count = rsBlock[i * 3 + 0];
+      var totalCount = rsBlock[i * 3 + 1];
+      var dataCount = rsBlock[i * 3 + 2];
+
+      for (var j = 0; j < count; j++) {
+        list.push(new QRRSBlock(totalCount, dataCount));
+      }
+    }
+
+    return list;
+  }
+
+  QRRSBlock.getRsBlockTable = function(typeNumber, errorCorrectLevel) {
+
+    switch (errorCorrectLevel) {
+      case QRErrorCorrectLevel.L:
+        return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
+      case QRErrorCorrectLevel.M:
+        return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
+      case QRErrorCorrectLevel.Q:
+        return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
+      case QRErrorCorrectLevel.H:
+        return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
+      default:
+        return undefined;
+    }
+  }
+
+  //---------------------------------------------------------------------
+  // QRBitBuffer
+  //---------------------------------------------------------------------
+
+  function QRBitBuffer() {
+    this.buffer = new Array();
+    this.length = 0;
+  }
+
+  QRBitBuffer.prototype = {
+
+    get: function(index) {
+      var bufIndex = Math.floor(index / 8);
+      return ((this.buffer[bufIndex] >>> (7 - index % 8)) & 1) == 1;
+    },
+
+    put: function(num, length) {
+      for (var i = 0; i < length; i++) {
+        this.putBit(((num >>> (length - i - 1)) & 1) == 1);
+      }
+    },
+
+    getLengthInBits: function() {
+      return this.length;
+    },
+
+    putBit: function(bit) {
+
+      var bufIndex = Math.floor(this.length / 8);
+      if (this.buffer.length <= bufIndex) {
+        this.buffer.push(0);
+      }
+
+      if (bit) {
+        this.buffer[bufIndex] |= (0x80 >>> (this.length % 8));
+      }
+
+      this.length++;
+    }
+  };
+
+  //---------------------------------------------------------------------
+  // Support Chinese
+  //---------------------------------------------------------------------
+  function utf16To8(text) {
+    var result = '';
+    var c;
+    for (var i = 0; i < text.length; i++) {
+      c = text.charCodeAt(i);
+      if (c >= 0x0001 && c <= 0x007F) {
+        result += text.charAt(i);
+      } else if (c > 0x07FF) {
+        result += String.fromCharCode(0xE0 | c >> 12 & 0x0F);
+        result += String.fromCharCode(0x80 | c >> 6 & 0x3F);
+        result += String.fromCharCode(0x80 | c >> 0 & 0x3F);
+      } else {
+        result += String.fromCharCode(0xC0 | c >> 6 & 0x1F);
+        result += String.fromCharCode(0x80 | c >> 0 & 0x3F);
+      }
+    }
+    return result;
+  }
+
+  uQRCode = {
+
+    errorCorrectLevel: QRErrorCorrectLevel,
+
+    defaults: {
+      size: 354,
+      margin: 0,
+      backgroundColor: '#ffffff',
+      foregroundColor: '#000000',
+      fileType: 'png', // 'jpg', 'png'
+      errorCorrectLevel: QRErrorCorrectLevel.H,
+      typeNumber: -1
+    },
+
+    make: function(options) {
+      return new Promise((reslove, reject) => {
+        var defaultOptions = {
+          canvasId: options.canvasId,
+          componentInstance: options.componentInstance,
+          text: options.text,
+          size: this.defaults.size,
+          margin: this.defaults.margin,
+          backgroundColor: this.defaults.backgroundColor,
+          foregroundColor: this.defaults.foregroundColor,
+          fileType: this.defaults.fileType,
+          errorCorrectLevel: this.defaults.errorCorrectLevel,
+          typeNumber: this.defaults.typeNumber
+        };
+        if (options) {
+          for (var i in options) {
+            defaultOptions[i] = options[i];
+          }
+        }
+        options = defaultOptions;
+        if (!options.canvasId) {
+          console.error('uQRCode: Please set canvasId!');
+          return;
+        }
+
+        function createCanvas() {
+          var qrcode = new QRCode(options.typeNumber, options.errorCorrectLevel);
+          qrcode.addData(utf16To8(options.text));
+          qrcode.make();
+
+          var ctx = uni.createCanvasContext(options.canvasId, options.componentInstance);
+          ctx.setFillStyle(options.backgroundColor);
+          ctx.fillRect(0, 0, options.size, options.size);
+
+          var tileW = (options.size - options.margin * 2) / qrcode.getModuleCount();
+          var tileH = tileW;
+
+          for (var row = 0; row < qrcode.getModuleCount(); row++) {
+            for (var col = 0; col < qrcode.getModuleCount(); col++) {
+              var style = qrcode.isDark(row, col) ? options.foregroundColor : options.backgroundColor;
+              ctx.setFillStyle(style);
+              var x = Math.round(col * tileW) + options.margin;
+              var y = Math.round(row * tileH) + options.margin;
+              var w = Math.ceil((col + 1) * tileW) - Math.floor(col * tileW);
+              var h = Math.ceil((row + 1) * tileW) - Math.floor(row * tileW);
+              ctx.fillRect(x, y, w, h);
+            }
+          }
+
+          setTimeout(function() {
+            ctx.draw(false, (function() {
+              setTimeout(function() {
+                uni.canvasToTempFilePath({
+                  canvasId: options.canvasId,
+                  fileType: options.fileType,
+                  width: options.size,
+                  height: options.size,
+                  destWidth: options.size,
+                  destHeight: options.size,
+                  success: function(res) {
+                    let resData; // 将统一为base64格式
+                    let tempFilePath = res.tempFilePath; // H5为base64，其他为相对路径
+
+                    // #ifdef H5
+                    resData = tempFilePath;
+                    options.success && options.success(resData);
+                    reslove(resData);
+                    // #endif
+
+                    // #ifdef APP-PLUS
+                    const path = plus.io.convertLocalFileSystemURL(tempFilePath) // 绝对路径
+                    let fileReader = new plus.io.FileReader();
+                    fileReader.readAsDataURL(path);
+                    fileReader.onloadend = res => {
+                      resData = res.target.result;
+                      options.success && options.success(resData);
+                      reslove(resData);
+                    };
+                    // #endif
+
+                    // #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+                    uni.getFileSystemManager().readFile({
+                      filePath: tempFilePath,
+                      encoding: 'base64',
+                      success: res => {
+                        resData = 'data:image/png;base64,' + res.data;
+                        options.success && options.success(resData);
+                        reslove(resData);
+                      }
+                    })
+                    // #endif
+
+                    // #ifndef H5 || APP-PLUS || MP-WEIXIN || MP-QQ || MP-TOUTIAO
+                    if (plus) {
+                      const path = plus.io.convertLocalFileSystemURL(tempFilePath) // 绝对路径
+                      let fileReader = new plus.io.FileReader();
+                      fileReader.readAsDataURL(path);
+                      fileReader.onloadend = res => {
+                        resData = res.target.result;
+                        options.success && options.success(resData);
+                        reslove(resData);
+                      };
+                    } else {
+                      uni.request({
+                        url: tempFilePath,
+                        method: 'GET',
+                        responseType: 'arraybuffer',
+                        success: res => {
+                          resData = `data:image/png;base64,${uni.arrayBufferToBase64(res.data)}`; // 把arraybuffer转成base64
+                          options.success && options.success(resData);
+                          reslove(resData);
+                        }
+                      })
+                    }
+                    // #endif
+                  },
+                  fail: function(error) {
+                    options.fail && options.fail(error);
+                    reject(error);
+                  },
+                  complete: function(res) {
+                    options.complete && options.complete(res);
+                  }
+                }, options.componentInstance);
+              }, options.text.length + 100);
+            })());
+          }, 150);
+        }
+
+        createCanvas();
+      });
+    }
+  }
+
+})()
+
+export default uQRCode
\ No newline at end of file
diff --git a/components/bind-mobile/bind-mobile.vue b/components/bind-mobile/bind-mobile.vue
new file mode 100644
index 0000000..c09bb1d
--- /dev/null
+++ b/components/bind-mobile/bind-mobile.vue
@@ -0,0 +1,413 @@
+<template>
+	<view>
+		<view @touchmove.prevent.stop>
+			<uni-popup ref="bindMobile" :custom="true" :mask-click="true">
+				<view class="bind-wrap">
+					<!-- #ifdef H5 -->
+					<view class="head color-base-bg">检测到您还未绑定手机请立即绑定您的手机号</view>
+					<view class="form-wrap">
+						<view class="label">手机号码</view>
+						<view class="form-item"><input type="number" placeholder="请输入您的手机号码" v-model="formData.mobile" /></view>
+						<block v-if="captchaConfig">
+							<view class="label">验证码</view>
+							<view class="form-item">
+								<input type="number" placeholder="请输入验证码" v-model="formData.vercode" />
+								<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
+							</view>
+						</block>
+						<view class="label">动态码</view>
+						<view class="form-item">
+							<input type="number" placeholder="请输入动态码" v-model="formData.dynacode" />
+							<view class="send color-base-text" @click="sendMobileCode">{{ dynacodeData.codeText }}</view>
+						</view>
+					</view>
+					<view class="footer">
+						<view @click="cancel">取消</view>
+						<view class="color-base-text" @click="confirm">确定</view>
+					</view>
+					<!-- #endif -->
+
+					<!-- #ifdef MP-WEIXIN || MP-QQ || MP-BAIDU -->
+					<view class="bind-tip-icon"><image :src="$util.img('public/picture/member/login.png')" mode="widthFix"></image></view>
+					<view class="bind-tips">为了方便您接收订单等信息，需要绑定您的手机号码</view>
+					<button open-type="getPhoneNumber" class="auth-login ns-btn-default-all color-base-bg" @getphonenumber="mobileAuthLogin"><text>点击绑定手机号码</text></button>
+					<!-- #endif  -->
+				</view>
+			</uni-popup>
+		</view>
+		<register-reward ref="registerReward"></register-reward>
+	</view>
+</template>
+
+<script>
+import uniPopup from '../uni-popup/uni-popup.vue';
+import validate from 'common/js/validate.js';
+import registerReward from '../register-reward/register-reward.vue';
+
+export default {
+	name: 'bind-mobile',
+	components: {
+		uniPopup,
+		registerReward
+	},
+	mixins: [validate],
+	data() {
+		return {
+			captchaConfig: 0,
+			captcha: {
+				id: '',
+				img: ''
+			},
+			dynacodeData: {
+				seconds: 120,
+				timer: null,
+				codeText: '获取动态码',
+				isSend: false
+			},
+			formData: {
+				key: '',
+				mobile: '',
+				vercode: '',
+				dynacode: ''
+			},
+			isSub: false
+		};
+	},
+	created() {
+		this.getCaptchaConfig();
+	},
+	methods: {
+		open() {
+			this.$refs.bindMobile.open();
+		},
+		cancel() {
+			this.$refs.bindMobile.close();
+		},
+		confirm() {
+			let authData = uni.getStorageSync('authInfo');
+			let data = {
+				mobile: this.formData.mobile,
+				key: this.formData.key,
+				code: this.formData.dynacode
+			};
+			if (this.captcha.id != '') {
+				data.captcha_id = this.captcha.id;
+				data.captcha_code = this.formData.vercode;
+			}
+
+			if (authData) Object.assign(data, authData);
+			if (authData.avatarUrl) data.headimg = authData.avatarUrl;
+			if (authData.nickName) data.nickname = authData.nickName;
+		
+			if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+			if (this.verify(data)) {
+				if (this.isSub) return;
+				this.isSub = true;
+				this.$api.sendRequest({
+					url: '/api/tripartite/mobile',
+					data,
+					success: res => {
+						if (res.code >= 0) {
+							uni.setStorage({
+								key: 'token',
+								data: res.data.token,
+								success: () => {
+									this.$store.commit('setToken', res.data.token);
+									this.$store.dispatch('getCartNumber');
+								}
+							});
+							this.$refs.bindMobile.close();
+
+							if (res.data.is_register && this.$refs.registerReward.getReward()) {
+								this.$refs.registerReward.open();
+							}
+						} else {
+							this.isSub = false;
+							this.getCaptcha();
+							this.$util.showToast({ title: res.message });
+						}
+					},
+					fail: res => {
+						this.isSub = false;
+						this.getCaptcha();
+					}
+				});
+			}
+		},
+		/**
+		 * 表单验证
+		 * @param {Object} data
+		 */
+		verify(data) {
+			let rule = [{ name: 'mobile', checkType: 'required', errorMsg: '请输入手机号' }, { name: 'mobile', checkType: 'phoneno', errorMsg: '请输入正确的手机号' }];
+			if (this.captchaConfig == 1) {
+				if (this.captcha.id != '') rule.push({ name: 'captcha_code', checkType: 'required', errorMsg: this.$lang('captchaPlaceholder') });
+			}
+			rule.push({ name: 'code', checkType: 'required', errorMsg: this.$lang('dynacodePlaceholder') });
+
+			var checkRes = validate.check(data, rule);
+			if (checkRes) {
+				return true;
+			} else {
+				this.$util.showToast({ title: validate.error });
+				return false;
+			}
+		},
+		/**
+		 * 获取验证码配置
+		 */
+		getCaptchaConfig() {
+			this.$api.sendRequest({
+				url: '/api/config/getCaptchaConfig',
+				success: res => {
+					if (res.code >= 0) {
+						this.captchaConfig = res.data.data.value.shop_reception_login;
+						if (this.captchaConfig) this.getCaptcha();
+					}
+				}
+			});
+		},
+		/**
+		 * 获取验证码
+		 */
+		getCaptcha() {
+			this.$api.sendRequest({
+				url: '/api/captcha/captcha',
+				data: {
+					captcha_id: this.captcha.id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.captcha = res.data;
+						this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
+					}
+				}
+			});
+		},
+		/**
+		 * 发送手机动态码
+		 */
+		sendMobileCode() {
+			if (this.dynacodeData.seconds != 120) return;
+			var data = {
+				mobile: this.formData.mobile,
+				captcha_id: this.captcha.id,
+				captcha_code: this.formData.vercode
+			};
+			var rule = [{ name: 'mobile', checkType: 'required', errorMsg: '请输入手机号' }, { name: 'mobile', checkType: 'phoneno', errorMsg: '请输入正确的手机号' }];
+			if (this.captchaConfig == 1) {
+				rule.push({ name: 'captcha_code', checkType: 'required', errorMsg: '请输入验证码' });
+			}
+			var checkRes = validate.check(data, rule);
+			if (!checkRes) {
+				this.$util.showToast({ title: validate.error });
+				return;
+			}
+			if (this.dynacodeData.isSend) return;
+			this.dynacodeData.isSend = true;
+
+			if (this.dynacodeData.seconds == 120) {
+				this.dynacodeData.timer = setInterval(() => {
+					this.dynacodeData.seconds--;
+					this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+				}, 1000);
+			}
+
+			this.$api.sendRequest({
+				url: '/api/tripartite/mobileCode',
+				data: data,
+				success: res => {
+					this.dynacodeData.isSend = false;
+					if (res.code >= 0) {
+						this.formData.key = res.data.key;
+					} else {
+						this.$util.showToast({ title: res.message });
+						thi.refreshDynacodeData();
+					}
+				},
+				fail: () => {
+					this.$util.showToast({ title: 'request:fail' });
+					this.dynacodeData.isSend = false;
+				}
+			});
+		},
+		mobileAuthLogin(e) {
+			if (e.detail.errMsg == 'getPhoneNumber:ok') {
+				let authData = uni.getStorageSync('authInfo');
+				var data = {
+					iv: e.detail.iv,
+					encryptedData: e.detail.encryptedData
+				};
+				if (authData) Object.assign(data, authData);
+				if (authData.avatarUrl) data.headimg = authData.avatarUrl;
+				if (authData.nickName) data.nickname = authData.nickName;
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+				if (this.isSub) return;
+				this.isSub = true;
+
+				this.$api.sendRequest({
+					url: '/api/tripartite/mobileauth',
+					data,
+					success: res => {
+						if (res.code >= 0) {
+							uni.setStorage({
+								key: 'token',
+								data: res.data.token,
+								success: () => {
+									this.$store.dispatch('getCartNumber');
+									this.$store.commit('setToken', res.data.token);
+								}
+							});
+							this.$refs.bindMobile.close();
+							if (res.data.is_register && this.$refs.registerReward.getReward()) {
+								this.$refs.registerReward.open();
+							}
+						} else {
+							this.isSub = false;
+							this.$util.showToast({ title: res.message });
+						}
+					},
+					fail: res => {
+						this.isSub = false;
+						this.$util.showToast({ title: 'request:fail' });
+					}
+				});
+			}
+		},
+		refreshDynacodeData() {
+			this.getCaptcha();
+			clearInterval(this.dynacodeData.timer);
+			this.dynacodeData = {
+				seconds: 120,
+				timer: null,
+				codeText: '获取动态码',
+				isSend: false
+			};
+		}
+	},
+	watch: {
+		'dynacodeData.seconds': {
+			handler(newValue, oldValue) {
+				if (newValue == 0) {
+					this.refreshDynacodeData();
+				}
+			},
+			immediate: true,
+			deep: true
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.bind-wrap {
+	width: 600rpx;
+	background: #fff;
+	box-sizing: border-box;
+	border-radius: 20rpx;
+	overflow: hidden;
+
+	.head {
+		text-align: center;
+		height: 90rpx;
+		line-height: 90rpx;
+		color: #fff;
+		font-size: $font-size-tag;
+	}
+
+	.form-wrap {
+		padding: 30rpx 40rpx;
+
+		.label {
+			color: #000;
+			font-size: $font-size-base;
+			line-height: 1.3;
+		}
+
+		.form-item {
+			margin: 20rpx 0;
+			display: flex;
+			padding-bottom: 10rpx;
+			border-bottom: 2rpx solid #eee;
+			align-items: center;
+
+			input {
+				font-size: $font-size-tag;
+				flex: 1;
+			}
+
+			.send {
+				font-size: $font-size-tag;
+				line-height: 1;
+			}
+
+			.captcha {
+				margin: 4rpx;
+				height: 52rpx;
+				width: 140rpx;
+			}
+		}
+	}
+
+	.footer {
+		border-top: 2rpx solid #eee;
+		display: flex;
+
+		view {
+			flex: 1;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+
+			&:first-child {
+				font-size: 28rpx;
+				border-right: 2rpx solid #eee;
+			}
+		}
+	}
+
+	.bind-tips {
+		color: #aaa;
+		font-size: $font-size-base;
+		padding: 20rpx 50rpx;
+		text-align: center;
+	}
+
+	.auth-login {
+		width: calc(100% - 100rpx);
+		margin: 20rpx auto 50rpx auto;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 80rpx;
+	}
+
+	.bind-tip-icon {
+		padding-top: 80rpx;
+		width: 100%;
+		text-align: center;
+
+		image {
+			width: 300rpx;
+		}
+	}
+}
+.ns-btn-default-all {
+	width: 100%;
+	height: 70rpx;
+	border-radius: $border-radius;
+	text-align: center;
+	line-height: 70rpx;
+	color: #ffffff;
+	font-size: $font-size-base;
+}
+</style>
+<style scoped>
+/deep/ .reward-popup .uni-popup__wrapper-box {
+	background: none !important;
+	max-width: unset !important;
+	max-height: unset !important;
+	overflow: unset !important;
+}
+</style>
diff --git a/components/farm-goods-detail-view/detail.js b/components/farm-goods-detail-view/detail.js
new file mode 100644
index 0000000..5049870
--- /dev/null
+++ b/components/farm-goods-detail-view/detail.js
@@ -0,0 +1,451 @@
+// 商品详情业务
+import {
+	Weixin
+} from '@/common/js/wx-jssdk.js';
+export default {
+	data() {
+		return {
+			skuId: 0,
+			goodsId:0,
+			isIphoneX: false, //判断手机是否是iphoneX以上
+			whetherCollection: 0,
+
+			//是否开启预览，0：不开启，1：开启
+			preview: 0,
+			token: "",
+			videoContext: '',
+
+			// 媒体,图片,视频
+
+			// 解决每个商品SKU图片数量不同时，无法切换到第一个，导致轮播图显示不出来
+			swiperInterval: 1,
+			swiperAutoplay: false,
+			swiperCurrent: 1,
+			switchMedia: 'img',
+
+			//评价
+			goodsEvaluate: [{
+				member_headimg: '',
+				member_name: '',
+				content: '',
+				images: [],
+				create_time: 0,
+				sku_name: ''
+			}],
+			evaluateConfig: {
+				evaluate_audit: 1,
+				evaluate_show: 0,
+				evaluate_status: 1
+			},
+
+			// 是否可分享到好物圈
+			goodsCircle: false,
+			memberId: 0,
+			service: null,
+			shareUrl: '', // 分享链接
+			source_member: 0, //分享人的id
+			isCommunity: false, //社群弹窗
+
+			poster: "-1", //海报
+			posterMsg: "", //海报错误信息
+			posterHeight: 0,
+			posterParams: {}, //海报所需参数
+			detailTab: 0,
+			goodsRoute:'',
+			posterApi:'',
+		}
+	},
+	created() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		this.token = uni.getStorageSync('token');
+	},
+	
+	methods: {
+		init(params) {
+			this.skuId = params.sku_id;
+			this.goodsId = params.goods_id;
+			this.preview = params.preview;
+			this.source_member = params.source_member;
+			this.whetherCollection = params.whetherCollection;
+			this.posterParams = params.posterParams;
+			
+			this.shareUrl = params.shareUrl;
+			this.memberId = params.memberId;
+			this.goodsRoute = params.goodsRoute;
+			this.posterApi = params.posterApi;
+			this.getService();
+			
+			// 评价设置
+			this.getEvaluateConfig();
+			this.videoContext = uni.createVideoContext('goodsVideo');
+			
+			// #ifdef MP-WEIXIN
+			this.goodsSyncToGoodsCircle();
+			// #endif
+			
+			this.getWhetherCollection();
+		},
+		swiperChange(e) {
+			this.swiperCurrent = e.detail.current + 1;
+		},
+
+		//-------------------------------------服务-------------------------------------
+
+		openMerchantsServicePopup() {
+			this.$refs.merchantsServicePopup.open();
+		},
+		closeMerchantsServicePopup() {
+			this.$refs.merchantsServicePopup.close();
+		},
+
+		//-------------------------------------属性-------------------------------------
+
+		openAttributePopup() {
+			this.$refs.attributePopup.open();
+		},
+		closeAttributePopup() {
+			this.$refs.attributePopup.close();
+		},
+		//获取用户是否关注
+		async getWhetherCollection() {
+			this.$api.sendRequest({
+				url: "/api/goodscollect/iscollect",
+				data: {
+					goods_id: this.goodsId
+				},
+				success: res => {
+					this.whetherCollection = res.data;
+				}
+			});
+		},
+		//-------------------------------------评价-------------------------------------
+		//商品评论列表
+		getGoodsEvaluate() {
+			
+			this.$api.sendRequest({
+				url: "/api/goodsevaluate/firstinfo",
+				data: {
+					goods_id: this.goodsSkuDetail.goods_id
+				},
+				success: res => {
+					let data = res.data;
+					if (data) {
+						this.goodsEvaluate = data;
+						this.goodsEvaluate.forEach((item, index) => {
+							if (this.goodsEvaluate[index].images) this.goodsEvaluate[index].images =
+								this.goodsEvaluate[index].images.split(",");
+							if (this.goodsEvaluate[index].is_anonymous == 1) this.goodsEvaluate[
+									index].member_name = this.goodsEvaluate[index].member_name
+								.replace(
+									this.goodsEvaluate[index].member_name.substring(1, this
+										.goodsEvaluate[index].member_name.length - 1), '***')
+						})
+						// if (this.goodsEvaluate.images) this.goodsEvaluate.images = this.goodsEvaluate.images.split(",");
+						// if (this.goodsEvaluate.is_anonymous == 1) this.goodsEvaluate.member_name = this.goodsEvaluate.member_name.replace(
+						// this.goodsEvaluate.member_name.substring(1, this.goodsEvaluate.member_name.length - 1), '***')
+					}
+				}
+			});
+		},
+
+		// 预览评价图片
+		previewEvaluate(index, img_index, field) {
+			var paths = [];
+			for (let i = 0; i < this.goodsEvaluate[index][field].length; i++) {
+				paths.push(this.$util.img(this.goodsEvaluate[index][field][i]));
+			}
+			uni.previewImage({
+				current: img_index,
+				urls: paths
+			});
+		},
+		//-------------------------------------关注-------------------------------------
+		editCollection() {
+			if (this.preview) return; // 开启预览，禁止任何操作和跳转
+
+			if (this.token) {
+
+				//未关注添加关注
+				if (this.whetherCollection == 0) {
+					this.$api.sendRequest({
+						url: "/api/goodscollect/add",
+						data: {
+							sku_id: this.skuId,
+							goods_id: this.goodsSkuDetail.goods_id,
+							sku_name: this.goodsSkuDetail.sku_name,
+							sku_price: this.goodsSkuDetail.show_price,
+							sku_image: this.goodsSkuDetail.sku_image
+						},
+						success: res => {
+							var data = res.data;
+							if (data > 0) {
+								this.whetherCollection = 1;
+							}
+						}
+					});
+				} else {
+					//已关注取消关注
+					this.$api.sendRequest({
+						url: "/api/goodscollect/delete",
+						data: {
+							goods_id: this.goodsSkuDetail.goods_id
+						},
+						success: res => {
+							var data = res.data;
+							if (data > 0) {
+								this.whetherCollection = 0;
+							}
+						}
+					});
+				}
+			} else {
+				if (this.source_member) {
+					this.$refs.login.open(this.shareUrl + '&source_member=' + this.source_member);
+				} else {
+					this.$refs.login.open(this.shareUrl);
+				}
+			}
+		},
+		
+		collection() {
+			if (this.preview) return; // 开启预览，禁止任何操作和跳转
+			this.editCollection();
+			if (this.token) {
+				return this.whetherCollection ? 0 : 1;
+			}
+		},
+		//-------------------------------------分享-------------------------------------
+		// 打开分享弹出层
+		openSharePopup() {
+			this.$refs.sharePopup.open();
+		},
+		// 关闭分享弹出层
+		closeSharePopup() {
+			this.$refs.sharePopup.close();
+		},
+		copyUrl() {
+			let text = this.$config.h5Domain + this.shareUrl;
+			if (this.memberId) text += '&source_member=' + this.memberId;
+			this.$util.copy(text, () => {
+				this.closeSharePopup();
+			});
+		},
+
+		//-------------------------------------海报-------------------------------------
+		// 打开海报弹出层
+		openPosterPopup() {
+			this.getGoodsPoster();
+			this.$refs.sharePopup.close();
+			this.$refs.posterPopup.open();
+			if (this.poster != '-1') {
+				setTimeout(() => {
+					let view = uni.createSelectorQuery().in(this).select(".poster-layer .image-wrap");
+					view.fields({
+						size: true,
+					}, data => {
+						let posterWhith = data.width;
+						let ratio = parseFloat((740 / posterWhith).toFixed(2));
+						if (this.token != '') {
+							this.posterHeight = parseInt(1240 / ratio);
+						} else {
+							this.posterHeight = parseInt(1100 / ratio);
+						}
+					}).exec();
+				}, 100);
+			}
+		},
+		// 关闭海报弹出层
+		closePosterPopup() {
+			this.$refs.posterPopup.close();
+		},
+		//生成海报
+		getGoodsPoster() {
+			uni.showLoading({
+				'title' : '海报生成中...'
+			})
+			//活动海报信息
+			if (this.memberId) this.posterParams.source_member = this.memberId;
+
+			this.$api.sendRequest({
+				url: this.posterApi,
+				data: {
+					page: this.goodsRoute,
+					qrcode_param: JSON.stringify(this.posterParams)
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.poster = res.data.path + "?time=" + new Date().getTime();
+					} else {
+						this.posterMsg = res.message;
+					}
+					uni.hideLoading();
+				},
+				fail: err => {
+					uni.hideLoading();
+				}
+			});
+		},
+		// 预览图片
+		previewMedia(index) {
+			var paths = [];
+			for (let i = 0; i < this.goodsSkuDetail.sku_images.length; i++) {
+				paths.push(this.$util.img(this.goodsSkuDetail.sku_images[i], {
+					size: 'big'
+				}));
+			}
+			uni.previewImage({
+				current: index,
+				urls: paths,
+				// longPressActions: {
+				// 	itemList: ['发送给朋友', '保存图片', '关注'],
+				// 	success: function(data) {
+				// 		console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+				// 	},
+				// 	fail: function(err) {
+				// 		console.log(err.errMsg);
+				// 	}
+				// }
+			});
+		},
+		swiperImageError(index) {
+			this.goodsSkuDetail.sku_images[index] = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		// #ifdef MP || APP-PLUS
+		//小程序中保存海报
+		saveGoodsPoster() {
+			let url = this.$util.img(this.poster);
+			uni.downloadFile({
+				url: url,
+				success: (res) => {
+					if (res.statusCode === 200) {
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: () => {
+								this.$util.showToast({
+									title: "保存成功"
+								});
+							},
+							fail: () => {
+								this.$util.showToast({
+									title: "保存失败，请稍后重试"
+								});
+							}
+						});
+					}
+				}
+			});
+		},
+		// #endif
+		//售后保障查询
+		getService() {
+			this.$api.sendRequest({
+				url: '/api/goods/aftersale',
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.service = res.data;
+					}
+				}
+			});
+		},
+		
+		// #ifdef MP-WEIXIN
+		/**
+		 *	将商品同步到微信圈子 
+		 */
+		goodsSyncToGoodsCircle() {
+			this.$api.sendRequest({
+				url: '/goodscircle/api/goods/sync',
+				data: {
+					goods_id: this.goodsSkuDetail.goods_id
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.goodsCircle = true;
+					}
+				}
+			})
+		},
+		/**
+		 * 将商品推荐到微信圈子
+		 */
+		openBusinessView() {
+			if (wx.openBusinessView) {
+				wx.openBusinessView({
+					businessType: 'friendGoodsRecommend',
+					extraData: {
+						product: {
+							item_code: this.goodsSkuDetail.goods_id,
+							title: this.goodsSkuDetail.sku_name,
+							image_list: this.goodsSkuDetail.sku_images.map((ele) => {
+								return this.$util.img(ele);
+							})
+						}
+					},
+					success: function(res) {
+						console.log('success', res);
+					},
+					fail: function(res) {
+						console.log('fail', res);
+					}
+				})
+			}
+		},
+		// #endif
+		getEvaluateConfig() {
+			this.$api.sendRequest({
+				url: '/api/goodsevaluate/config',
+				success: res => {
+					if (res.code == 0) {
+						var data = res.data;
+						this.evaluateConfig = data;
+						if (this.evaluateConfig.evaluate_show == 1) {
+							//商品评论
+							this.getGoodsEvaluate();
+						}
+					}
+				}
+			});
+		},
+		toEvaluateDetail(id) {
+			this.$util.redirectTo('/pages_tool/goods/evaluate', {
+				goods_id: id
+			});
+		},
+		showImg(e) {
+			//拿到图片的路径里面的内容放在我们数组中
+			let contentimg = e.target.dataset.nodes;
+			let arrImg = [];
+			for (var i = 0; i < contentimg.length; i++) {
+				var img = contentimg[i].children;
+				if (Array.isArray(img)) {
+					for (var j = 0; j < img.length; j++) {
+						if (img[j].attrs && img[j].name == "img") {
+							if (img[j].attrs.src) {
+								arrImg.push(img[j].attrs.src)
+							}
+						}
+					}
+				}
+			}
+			//最后一步就是把我们的所有图片放在预览的api中就可以了
+			uni.previewImage({
+				current: arrImg,
+				urls: arrImg,
+			})
+		},
+
+		//-------------------------------------社群-------------------------------------
+
+		//添加福利群
+		onCommunity() {
+			this.isCommunity = true
+		},
+		onCloseCommunity() {
+			this.isCommunity = false
+		}
+		
+ 
+	}
+	
+}
diff --git a/components/farm-goods-detail-view/goods-detail-view.vue b/components/farm-goods-detail-view/goods-detail-view.vue
new file mode 100644
index 0000000..6b13a6d
--- /dev/null
+++ b/components/farm-goods-detail-view/goods-detail-view.vue
@@ -0,0 +1,350 @@
+<template>
+	<view>
+		<view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
+			<view class="goods-container">
+				<!-- 弹幕 -->
+				<pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai" :duration="1600" :wait="1900" :top="400" :left="0" :radius="60" :loop="true" :info="goodsSkuDetail.barrageData"></pengpai-fadein-out>
+				
+				<!-- 商品媒体信息 -->
+				<view class="goods-media">
+					<!-- 商品图片 -->
+					<view class="goods-img" :class="{ show: switchMedia == 'img' }">
+						<swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
+							<swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
+								<view class="item" @click="previewMedia(index)">
+									<image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
+								</view>
+							</swiper-item>
+						</swiper>
+						<view class="img-indicator-dots">
+							<text>{{ swiperCurrent }}</text>
+							<text v-if="goodsSkuDetail.sku_images">/{{ goodsSkuDetail.sku_images.length }}</text>
+						</view>
+					</view>
+
+					<!-- 商品视频 -->
+					<view class="goods-video" :class="{ show: switchMedia == 'video' }">
+						<video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)" :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
+					</view>
+
+					<!-- 切换视频、图片 -->
+					<view class="media-mode" v-if="goodsSkuDetail.video_url != ''">
+						<text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
+						<text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
+					</view>
+				</view>
+
+				<!-- 价格区域 -->
+				<view class="goods-gression">
+					<slot name="price"></slot>
+				</view>
+
+				<view class="newdetail margin-bottom">
+					<!-- 入口区域 -->
+					<slot name="entrance"></slot>
+
+					<view class="item goods-attribute" @click="openAttributePopup()" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
+						<view class="label">属性</view>
+						<view class="box">
+							<text v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index" v-if="index < 2">{{ item.attr_name }}: {{ item.attr_value_name }}</text>
+						</view>
+						<text class="iconfont iconright"></text>
+						<!-- <view class="img-wrap"><image :src="$util.img('public/picture/goods/detail_more.png')" mode="aspectFit" /></view> -->
+					</view>
+					<view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
+						<view class="label">服务</view>
+						<view class="list-wrap">
+							<view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
+								<view class="item-wrap-box">
+									<view class="item-wrap-icon">
+										<text class="iconfont icondui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+										<image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
+										<diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
+									</view>
+									<text>{{ item.service_name }}</text>
+								</view>
+							</view>
+						</view>
+						<text class="iconfont iconright"></text>
+						<!-- <view class="img-wrap"><image :src="$util.img('public/picture/goods/detail_more.png')" mode="aspectFit" /></view> -->
+					</view>
+				</view>
+
+				<!-- 商品属性 -->
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="attributePopup" type="bottom">
+						<view class="goods-attribute-popup-layer popup-layer">
+							<view class="head-wrap" @click="closeAttributePopup()">
+								<text>商品属性</text>
+								<text class="iconfont iconclose"></text>
+							</view>
+							<scroll-view scroll-y class="goods-attribute-body">
+								<view class="item" v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
+									<text class="attr-name">{{ item.attr_name }}</text>
+									<text class="value-name">{{ item.attr_value_name }}</text>
+								</view>
+							</scroll-view>
+							<view class="button-box"><button type="primary" @click="closeAttributePopup()">确定</button></view>
+						</view>
+					</uni-popup>
+				</view>
+
+				<!-- 商品服务 -->
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="merchantsServicePopup" type="bottom">
+						<view class="goods-merchants-service-popup-layer popup-layer">
+							<view class="head-wrap" @click="closeMerchantsServicePopup()">
+								<text>商品服务</text>
+								<text class="iconfont iconclose"></text>
+							</view>
+							<scroll-view scroll-y>
+								<view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
+									<view class="item-icon" :class="{'empty-desc':!item.desc}">
+										<text class="iconfont icondui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+										<image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
+										<diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
+									</view>
+									<view class="info-wrap">
+										<text class="title">{{ item.service_name }}</text>
+										<text class="describe" v-if="item.desc">{{ item.desc }}</text>
+									</view>
+								</view>
+							</scroll-view>
+							<view class="button-box"><button type="primary" @click="closeMerchantsServicePopup()">确定</button></view>
+						</view>
+					</uni-popup>
+				</view>
+
+				<!-- 业务区域 -->
+				<slot name="business"></slot>
+
+				<view class="detail-community" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_state == 1">
+					<view class="community-box">
+						<image :src="$util.img('public/picture/goods/detail_erweiImage.png')" mode="aspectFill"></image>
+						<view class="community-content">
+							<view class="community-title">{{ goodsSkuDetail.qr_data.qr_name }}</view>
+							<view class="community-txt">{{ goodsSkuDetail.qr_data.community_describe }}</view>
+						</view>
+					</view>
+					<view class="community-btn" @click="onCommunity()">添加</view>
+				</view>
+
+				<!-- 促销 -->
+				<view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
+					<view class="community-model-content" @click.stop>
+						<view class="community-model-content-radius"><view>添加社群</view></view>
+						<view class="community-model-content-draw" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_img">
+							<image
+								:src="
+									goodsSkuDetail.qr_data.qr_img != '' && goodsSkuDetail.qr_data.qr_state == 1
+										? $util.img(goodsSkuDetail.qr_data.qr_img)
+										: $util.img('public/picture/goods/detail_erweiImage.png')
+								"
+								mode="aspectFill"
+								show-menu-by-longpress="true"
+							></image>
+						</view>
+						<view class="community-model-content-text">长按识别二维码，添加社群</view>
+					</view>
+					<view class="community-model-close" @click.stop="onCloseCommunity()"><text class="iconfont iconclose"></text></view>
+				</view>
+
+
+				<!-- 参与流程 -->
+				<slot name="articipation"></slot>
+
+        <!-- 产品属性 -->
+
+				<!-- 商品评价 -->
+<!--				<view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1">-->
+<!--					<view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">-->
+<!--						<view class="tit">-->
+<!--							&lt;!&ndash; <view class="tit" :class="{ active: goodsEvaluate.content }"> &ndash;&gt;-->
+<!--							<view>-->
+<!--								<text class="color-title font-size-toolbar">-->
+<!--									评价-->
+<!--									<text class="font-size-base">({{ goodsSkuDetail.evaluate }})</text>-->
+<!--								</text>-->
+<!--								<text class="evaluate-item-empty" v-if="!goodsSkuDetail.evaluate">暂无评价</text>-->
+<!--								<view class="evaluate-item-empty" v-else>-->
+<!--									<text class="font-size-tag">查看全部</text>-->
+<!--									<text class="iconfont iconright font-size-tag"></text>-->
+<!--								</view>-->
+<!--							</view>-->
+<!--						</view>-->
+<!--						<view class="evaluate-item" v-for="(item, index) in goodsEvaluate" :key="index" v-if="item.content">-->
+<!--							<view class="evaluator">-->
+<!--								<view class="evaluator-info">-->
+<!--									<view class="evaluator-face">-->
+<!--										<image-->
+<!--											v-if="item.member_headimg"-->
+<!--											:src="$util.img(item.member_headimg)"-->
+<!--											@error="item.member_headimg = $util.getDefaultImage().head"-->
+<!--											mode="aspectFill"-->
+<!--										/>-->
+<!--										<image-->
+<!--											v-else-->
+<!--											:src="$util.getDefaultImage().head"-->
+<!--											@error="item.member_headimg = $util.getDefaultImage().head"-->
+<!--											mode="aspectFill"-->
+<!--										/>-->
+<!--									</view>-->
+<!--									<text class="evaluator-name" v-if="item.member_name.length > 2 && item.is_anonymous == 1">-->
+<!--										{{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}-->
+<!--									</text>-->
+<!--									<text class="evaluator-name" v-else>{{ item.member_name }}</text>-->
+<!--								</view>-->
+<!--								<text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>-->
+<!--							</view>-->
+<!--							<view class="cont margin-top">{{ item.content }}</view>-->
+<!--							<scroll-view scroll-x="true">-->
+<!--								<view class="evaluate-img" v-if="item.images">-->
+<!--									<view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">-->
+<!--										<image :src="$util.img(img)" mode="aspectFill" />-->
+<!--									</view>-->
+<!--								</view>-->
+<!--							</scroll-view>-->
+<!--						</view>-->
+<!--					</view>-->
+<!--				</view>-->
+
+				<!-- 详情 -->
+				<view class="goods-detail-tab">
+					<view class="detail-tab">
+						<!-- <view class="tab-line"></view> -->
+						<view class="tab-item">商品详情</view>
+						<!-- <view class="tab-line"></view> -->
+						<!-- <view v-if="service.is_display == 1" class="tab-item" :class="detailTab == 1 ? 'active color-base-text' : ''" @click="detailTab = 1">售后保障</view> -->
+					</view>
+
+					<view class="detail-content active" >
+						<view class="detail-content-item">
+							<view class="goods-details" v-if="goodsSkuDetail.goods_content">
+								<rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text>
+							</view>
+							<view class="goods-details active" v-else>该商家暂无上传相关详情哦！</view>
+						</view>
+					<!-- 	<block v-if="service">
+							<view class="detail-content-item" v-show="detailTab == 1 && service.is_display == 1">
+								<view class="goods-details" v-if="service.content">
+									<rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
+								</view>
+								<view class="goods-details active" v-else>该商品暂无相关售后哦！</view>
+							</view>
+						</block> -->
+					</view>
+				</view>
+
+				<!-- 商品推荐 -->
+<!--				<ns-goods-recommend ref="goodrecommend" route="goodsdetail"></ns-goods-recommend>-->
+				
+				<ns-copyright></ns-copyright>
+				
+				<!-- 海报 -->
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="posterPopup" type="bottom" class="poster-layer">
+						<template v-if="poster != '-1'">
+							<view>
+								<view class="image-wrap"><image :src="$util.img(poster)" :show-menu-by-longpress="true" /></view>
+								<!-- #ifdef MP || APP-PLUS  -->
+								<view class="save" @click="saveGoodsPoster()">保存图片</view>
+								<!-- #endif -->
+								<!-- #ifdef H5 -->
+								<view class="save">长按保存图片</view>
+								<!-- #endif -->
+							</view>
+							<view class="close iconfont iconclose" @click="closePosterPopup()"></view>
+						</template>
+						<view v-else class="msg">{{ posterMsg }}</view>
+					</uni-popup>
+				</view>
+
+				<!-- 分享弹窗 -->
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="sharePopup" type="bottom" class="share-popup">
+						<view>
+							<view class="share-title">分享</view>
+							<view class="share-content">
+								<!-- #ifdef MP -->
+								<view class="share-box">
+									<button class="share-btn" :plain="true" open-type="share">
+										<view class="iconfont iconiconfenxianggeihaoyou"></view>
+										<text>分享给好友</text>
+									</button>
+								</view>
+								<!-- #endif -->
+
+								<!-- #ifdef MP-WEIXIN -->
+								<view class="share-box" v-if="goodsCircle">
+									<button class="share-btn" :plain="true" @click="openBusinessView">
+										<view class="iconfont iconhaowuquan"></view>
+										<text>分享到好物圈</text>
+									</button>
+								</view>
+								<!-- #endif -->
+
+								<view class="share-box" @click="openPosterPopup">
+									<button class="share-btn" :plain="true">
+										<view class="iconfont iconpengyouquan"></view>
+										<text>生成分享海报</text>
+									</button>
+								</view>
+								<!-- #ifdef H5 -->
+								<view class="share-box" @click="copyUrl">
+									<button class="share-btn" :plain="true">
+										<view class="iconfont iconfuzhilianjie"></view>
+										<text>复制链接</text>
+									</button>
+								</view>
+								<!-- #endif -->
+							</view>
+							<view class="share-footer" @click="closeSharePopup"><text>取消分享</text></view>
+						</view>
+					</uni-popup>
+				</view>
+				
+				<slot name="fixedbtn"></slot>
+			</view>
+		</view>
+
+		<!-- 操作区域 -->
+		<slot name="action"></slot>
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+// 商品详情视图
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+import scroll from '@/common/js/scroll-view.js';
+import toTop from '@/components/toTop/toTop.vue';
+import goodsDetailBase from '@/common/js/goods_detail_base.js';
+import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
+import detail from './detail.js';
+
+export default {
+	name: 'goods-detail-view',
+	props: {
+		goodsSkuDetail: {
+			type: Object,
+			default: () => {
+				return {};
+			}
+		}
+	},
+	components: {
+		uniPopup,
+		nsGoodsRecommend,
+		pengpaiFadeinOut,
+		toTop
+	},
+	mixins: [scroll, detail]
+};
+</script>
+
+<style lang="scss">
+@import '@/common/css/goods_detail.scss';
+</style>
+<style scoped></style>
diff --git a/components/share-panel/share-panel.vue b/components/share-panel/share-panel.vue
new file mode 100644
index 0000000..120db4e
--- /dev/null
+++ b/components/share-panel/share-panel.vue
@@ -0,0 +1,408 @@
+<!-- 省、市 两级地区选择器 -->
+<template>
+  <view>
+    <!-- 分享弹框 -->
+    <van-share-sheet
+        v-model="show"
+        title="立即分享给好友"
+        :close-on-click-overlay="false"
+        :options="options"
+        :cancel-text="''"
+        @click-overlay="cancel"
+        @cancel="cancel"
+        @select="onShare"
+    />
+    <!-- 二维码弹框 -->
+    <van-popup ref="qrcodeContent" class="qrcode-content" v-model="share_qrcode_show">
+      <canvas ref="qrcode" canvas-id="share-qrcode" class="qrcode-canvas" />
+    </van-popup>
+    <!-- 海报弹框 -->
+    <van-popup class="poster-content" v-model="share_poster_show">
+      <canvas ref="posterImage" canvas-id="posterImage" id="posterImage" class="poster-image" />
+      <image :src="poster_image" :show-menu-by-longpress="true" class="poster-image poster-show-image"/>
+    </van-popup>
+    <!--<view v-if="share_poster_show" class="poster-tip">-->
+    <!--  <view class="download-button" @click="downloadPoster">下载海报</view>-->
+    <!--</view>-->
+
+    <view v-if="share_poster_show" class="poster-tip">长按图片保存</view>
+    <!--同意关闭按钮-->
+    <van-button v-if="share_poster_show || share_qrcode_show" type="danger" size="small" class="cancel-btn" @click="cancelAll">
+      关闭
+    </van-button>
+  </view>
+</template>
+
+<script>
+import uQRCode from 'common/js/uqrcode.js'
+import {Weixin} from "../../common/js/wx-jssdk";
+import Http from "../../common/js/http";
+
+export default {
+  name: 'share-panel',
+  props:{
+    // 是否显示
+    show:{
+      type: Boolean,
+      default: function() {
+        return false;
+      }
+    },
+    // 分享信息
+    share: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    },
+    // 分享参数
+    shareParams: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },
+  },
+  onLoad() {},
+  onShow() {},
+  data() {
+    return {
+      userInfo: {},
+      path: '',
+      options: [
+        // { name: '微信', icon: 'wechat' },
+        { name: '复制链接', icon: 'link' },
+        { name: '分享海报', icon: 'poster' },
+        { name: '二维码', icon: 'qrcode' },
+      ],
+      share_qrcode_show: false,// 二维码分享
+      share_poster_show: false,// 海报分享
+      share_id: '',
+
+      poster_image: '',
+    };
+  },
+  watch: {
+    share: {
+      handler(newValue, oldValue) {
+
+        this.createSharePath();
+        this.setPublicShare();
+      },
+      immediate: false,
+      deep: true
+    }
+  },
+  created() {},
+  mounted() {
+    // 生成唯一分享id
+    this.createShareId();
+    // 获取个人信息
+    this.getUserInfo();
+  },
+  methods: {
+    //获取个人信息
+    getUserInfo() {
+      this.$api.sendRequest({
+        url: '/api/member/info',
+        success: res => {
+          if (res.code == 0) {
+            this.userInfo = res.data;
+
+            this.createSharePath();
+            this.setPublicShare();
+          }
+        }
+      });
+    },
+    // 关闭
+    cancel(){
+      this.$emit('close');
+    },
+    // 关闭全部
+    cancelAll(){
+      this.share_qrcode_show = false;
+      this.share_poster_show = false;
+
+      this.cancel();
+    },
+    // 点击分享
+    onShare(option,index){
+      this.recordSharing();
+      // 根据点击的类型进行对应的分享操作
+      let icon = option.icon;
+      switch (icon){
+        case 'link': this.shareLink();break;
+        case 'poster': this.sharePoster();break;
+        case 'qrcode': this.shareQrcode();break;
+      }
+    },
+    // 分享 —— 复制链接
+    shareLink(){
+      this.$util.copy(this.path);
+      this.cancel();
+    },
+    // 分享 —— 二维码
+    shareQrcode(is_get = false){
+      let _this = this;
+      _this.cancel();
+      _this.share_qrcode_show = true
+      return new Promise((req, rej) => {
+        _this.$nextTick(() => {
+          if(is_get) _this.$refs.qrcodeContent.$el.style.marginLeft = '50000px';
+          else _this.$refs.qrcodeContent.$el.style.marginLeft = '0';
+          let size = _this.$refs.qrcode.$el.offsetHeight;
+          uQRCode.make({
+            canvasId: 'share-qrcode',
+            componentInstance: this,
+            text: _this.path,
+            size: size,
+            margin: 10,
+            backgroundColor: '#ffffff',
+            foregroundColor: '#000000',
+            fileType: 'jpg',
+            errorCorrectLevel: uQRCode.errorCorrectLevel.H,
+            success: res => {
+              req(res);
+            }
+          });
+        })
+      });
+    },
+    // 分享 —— 生成海报
+    async sharePoster(){
+      // 显示内容
+      let _this = this;
+      _this.share_poster_show = true;
+      let backgroundImage = _this.$util.img('public/picture/aijiu/article_bg.jpg');// 背景图片
+      let avatar = _this.$util.img(  _this.userInfo.headimg );// 用户头像
+      let qrcode = '';
+      await _this.shareQrcode(true).then((res)=>{
+        qrcode = res;
+        _this.share_qrcode_show = false
+      });
+      // 开始绘制
+      _this.$nextTick(() => {
+        // 获取画布大小
+        let width = _this.$refs.posterImage.$el.offsetWidth;// 300
+        let height = _this.$refs.posterImage.$el.offsetHeight;// 510
+        // 生成基本画布
+        let ctx = uni.createCanvasContext('posterImage', this);
+        ctx.setFillStyle('#ffffff'); // 默认白色
+        ctx.fillRect(0, 0, width, height);// fillRect(x,y,宽度，高度)
+        // 绘制背景图
+        ctx.drawImage(backgroundImage, 0, 0, width , height) // drawImage(图片路径,x,y,绘制图像的宽度，绘制图像的高度)
+        // 绘制头像
+        _this.drawAvatar(ctx,avatar,width);
+        // 绘制用户昵称
+        let nicknameLen = this.userInfo.nickname.length;
+        let nicknameX = (width / 2) - (nicknameLen * 20 / 2);
+        ctx.setFillStyle('#000000');
+        _this.drawText(ctx,"20px Microsoft YaHei",this.userInfo.nickname,nicknameX,230,width)
+        // 绘制文字
+        ctx.setFillStyle('#a67344');
+        _this.drawText(ctx,"20px Microsoft YaHei","欢迎关注",110,45,width)
+        _this.drawText(ctx,"20px Microsoft YaHei","全叶真爱",110,70,width)
+        // 邀请词
+        let invitation = "邀请您一起学养生，懂健康";
+        let len = invitation.length;
+        let invitationX = (width / 2) - (len * 15 / 2);
+        _this.drawText(ctx,"15px Microsoft YaHei",invitation,invitationX,270,width)
+        // 二维码
+        let qrcodeSize = 100;
+        ctx.drawImage(qrcode, (width / 2 - (qrcodeSize / 2)), 290, qrcodeSize , qrcodeSize) // drawImage(图片路径,x,y,绘制图像的宽度，绘制图像的高度)
+        // 将内容绘制到画布上面
+        ctx.draw(true,function () {
+
+
+          uni.canvasToTempFilePath({
+            canvasId: 'posterImage',
+            success: (res) => {
+              //console.log(res.tempFilePath);
+              _this.poster_image = res.tempFilePath
+            },
+            fail: function(err) {
+              console.log("失败")
+              console.log(err)
+            }
+          })
+
+
+        });
+
+
+
+
+
+      })
+    },
+    // 生成海报 —— 绘制头像
+    drawAvatar(ctx,avatar,width){
+      let arcX = width / 2;
+      let avatarSize = 40;
+      ctx.save();
+      // 绘制头像背景
+      ctx.beginPath();
+      ctx.fillStyle = "#d7c08a";
+      ctx.arc(arcX,160,45,0,2*Math.PI);
+      ctx.fill();
+      // 绘制头像
+      ctx.beginPath();
+      ctx.arc(arcX,160, avatarSize, 0, Math.PI * 2);
+      ctx.clip();
+      ctx.drawImage(avatar, arcX - avatarSize, 160 - avatarSize , avatarSize * 2 , avatarSize * 2) // drawImage(图片路径,x,y,绘制图像的宽度，绘制图像的高度)
+      ctx.closePath();
+      ctx.restore();
+    },
+    // 生成海报 —— 绘制文字
+    drawText(ctx,size,text,x,y,maxWidth){
+      ctx.save();
+      ctx.beginPath();
+      ctx.font = size;
+      ctx.fillText(text, x, y, maxWidth);
+      ctx.closePath();
+      ctx.restore();
+    },
+    // 点击下载海报
+    downloadPoster(){
+      uni.canvasToTempFilePath({
+        canvasId: 'posterImage',
+        success: (res) => {
+          uni.downloadFile({
+            url: res.tempFilePath,
+            success: (res) => {
+              var link = document.createElement('a') //创建一个a标签
+              link.href = res.tempFilePath//把a标签的href属性赋值到生成好了的url
+              link.download = '邀请好友.png'//通过a标签的download属性修改下载图片的名字
+              link.click()//让a标签的click函数，直接下载图片
+            },
+          })
+        },
+        fail: function(err) {
+          console.log("失败canvasToTempFilePath")
+          console.log(err)
+        }
+      })
+    },
+    // 记录分享信息
+    recordSharing(){
+      let _this = this;
+      _this.$api.sendRequest({
+        url: '/api/ShareRecord/recordShareInfo',
+        data: { share_path: _this.path }
+      });
+    },
+    // 设置公众号分享信息
+    setPublicShare(){
+      let shareUrl = this.path;
+      let _this = this;
+      this.$util.setPublicShare({
+        title: _this.share.title, // 分享标题
+        desc: _this.share.desc, // 分享描述
+        link: shareUrl,
+        imgUrl: _this.$util.img(_this.share.imgUrl), // 分享图标
+      },function (params) {
+        Http.sendRequest({
+          url: '/api/ShareRecord/recordShareInfo',
+          data: { share_path: params.link },
+          success: res => {},
+          fail:err=>{}
+        })
+      })
+    },
+    // 生成唯一的分享id
+    createShareId(){
+      let timeDate = new Date()
+      this.share_id = timeDate.getTime().toString();
+    },
+    // 生成分享链接
+    createSharePath(){
+      // 生成唯一id
+      this.createShareId();
+      let member_id = this.userInfo.member_id;
+      this.path = '';
+      // 生成分享链接
+      if(this.share.link){
+        // 如果传递了分享链接  使用分享链接
+        this.path = this.share.link + `?source_member=${member_id}&share_id=` + this.share_id.toString();
+      }else{
+        // 没有分享链接 生成分享链接
+        let pages = getCurrentPages();
+        let currentPage = pages[pages.length - 1].$page
+        let currentPath = currentPage.path + `?source_member=${member_id}&share_id=` + this.share_id.toString();
+        let options = currentPage.options;
+        // 获取分享的参数
+        if(Object.keys(this.shareParams).length > 0){
+          this.shareParams.forEach(function (item, index) {
+            if(options[item]) currentPath = currentPath + `&${item}=` + options[item];
+          });
+        }
+
+        let split = window.location.href.split(currentPage.path)
+        this.path = split[0] + currentPath;
+      }
+    }
+
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.qrcode-content{
+  width: 60vw;
+  height: 60vw;
+  .qrcode-canvas{
+    width: 60vw;
+    height: 60vw;
+  }
+}
+.poster-content{
+  --poster-size-: 300px; // 海报的大小
+  width: var(--poster-size-);
+  height: calc(var(--poster-size-) * 1.7);
+
+  .poster-image{
+    width: 100%;
+    height: 100%;
+  }
+
+  .poster-show-image{
+    position: absolute;
+    z-index: 555555;
+    top: 0;
+  }
+}
+.poster-tip {
+  position: absolute;
+  font-size: 50rpx;
+  font-weight: bold;
+  z-index: 99999;
+  bottom: 160rpx;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  .download-button{
+    color: #fff;
+    background: #ee0a24;
+    width: 100px;
+    border-radius: 30px;
+    font-size: 15px;
+    height: 30px;
+    line-height: 30px;
+  }
+}
+.cancel-btn{
+  position: absolute;
+  top: 40rpx;
+  right: 40rpx;
+  z-index: 999999;
+  width: 100rpx;
+  height: 50rpx;
+  font-size: 26rpx;
+  border-radius: 50rpx;
+}
+</style>
+
diff --git a/main.js b/main.js
index 11a6c68..ab2c6fb 100644
--- a/main.js
+++ b/main.js
@@ -10,6 +10,10 @@ import Lang from './common/js/lang.js'
 import Config from './common/js/config.js'
 import globalConfig from './common/js/golbalConfig.js';
 
+import Vant from 'vant';
+import 'vant/lib/index.less';
+Vue.use(Vant);
+
 Vue.prototype.$store = store //挂在vue
 
 Vue.config.productionTip = false
diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md
index f4e08bd..7c91d7b 100644
--- a/node_modules/jweixin-module/README.md
+++ b/node_modules/jweixin-module/README.md
@@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js
 ## 使用
 
 ```js
-var wx = require('jweixin-module')
-wx.ready(function(){
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
     // TODO
 });
 ```
diff --git a/node_modules/jweixin-module/out/index.js b/node_modules/jweixin-module/out/index.js
deleted file mode 100644
index 807ab6a..0000000
--- a/node_modules/jweixin-module/out/index.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,n){"object"==typeof exports&&"object"==typeof module?module.exports=n(e):"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){function c(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,r(e),function(e){a(n,e,i)}):d(n,i)}function i(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),a(n,e,i)}):d(n,t||i)}function r(e){return(e=e||{}).appId=M.appId,e.verifyAppId=M.appId,e.verifySignType="sha1",e.verifyTimestamp=M.timestamp+"",e.verifyNonceStr=M.nonceStr,e.verifySignature=M.signature,e}function n(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function a(e,n,i){"openEnterpriseChat"==e&&(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=f[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",M.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function s(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=p[t];o&&(e[n]=o)}return e}}function d(e,n){if(!(!M.debug||n&&n.isInnerInvoke)){var i=f[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function l(){return(new Date).getTime()}function u(e){I&&(o.WeixinJSBridge?e():t.addEventListener&&t.addEventListener("WeixinJSBridgeReady",e,!1))}if(!o.jWeixin){var p={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},f=function(){var e={};for(var n in p)e[p[n]]=n;return e}(),t=o.document,m=t.title,g=navigator.userAgent.toLowerCase(),h=navigator.platform.toLowerCase(),v=!(!h.match("mac")&&!h.match("win")),S=-1!=g.indexOf("wxdebugger"),I=-1!=g.indexOf("micromessenger"),y=-1!=g.indexOf("android"),_=-1!=g.indexOf("iphone")||-1!=g.indexOf("ipad"),w=(O=g.match(/micromessenger\/(\d+\.\d+\.\d+)/)||g.match(/micromessenger\/(\d+\.\d+)/))?O[1]:"",k={initStartTime:l(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},T={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:_?1:y?2:-1,clientVersion:w,url:encodeURIComponent(location.href)},M={},P={_completes:[]},x={state:0,data:{}};u(function(){k.initEndTime=l()});var A=!1,V=[],C={config:function(e){d("config",M=e);var t=!1!==M.check;u(function(){if(t)c(p.config,{verifyJsApiList:s(M.jsApiList)},function(){P._complete=function(e){k.preVerifyEndTime=l(),x.state=1,x.data=e},P.success=function(e){T.isPreVerifyOk=0},P.fail=function(e){P._fail?P._fail(e):x.state=-1};var t=P._completes;return t.push(function(){!function(e){if(!(v||S||M.debug||w<"6.0.2"||T.systemType<0)){var i=new Image;T.appId=M.appId,T.initTime=k.initEndTime-k.initStartTime,T.preVerifyTime=k.preVerifyEndTime-k.preVerifyStartTime,C.getNetworkType({isInnerInvoke:!0,success:function(e){T.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+T.version+"&o="+T.isPreVerifyOk+"&s="+T.systemType+"&c="+T.clientVersion+"&a="+T.appId+"&n="+T.networkType+"&i="+T.initTime+"&p="+T.preVerifyTime+"&u="+T.url;i.src=n}})}}()}),P.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();P._completes=[]},P}()),k.preVerifyStartTime=l();else{x.state=1;for(var e=P._completes,n=0,i=e.length;n<i;++n)e[n]();P._completes=[]}}),C.invoke||(C.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,r(n),i)},C.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=x.state?e():(P._completes.push(e),!I&&M.debug&&e())},error:function(e){w<"6.0.2"||(-1==x.state?e(x.data):P._fail=e)},checkJsApi:function(e){c("checkJsApi",{jsApiList:s(e.jsApiList)},(e._complete=function(e){if(y){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=f[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){i(p.onMenuShareTimeline,{complete:function(){c("shareTimeline",{title:e.title||m,desc:e.title||m,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){i(p.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?c("sendAppMessage",{title:n.title||m,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):c("sendAppMessage",{title:n.title||m,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){i(p.onMenuShareQQ,{complete:function(){c("shareQQ",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){i(p.onMenuShareWeibo,{complete:function(){c("shareWeiboApp",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){i(p.onMenuShareQZone,{complete:function(){c("shareQZone",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){c("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){c("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){c("startRecord",{},e)},stopRecord:function(e){c("stopRecord",{},e)},onVoiceRecordEnd:function(e){i("onVoiceRecordEnd",e)},playVoice:function(e){c("playVoice",{localId:e.localId},e)},pauseVoice:function(e){c("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){c("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){i("onVoicePlayEnd",e)},uploadVoice:function(e){c("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){c("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){c("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){c("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(y){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){c(p.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){c("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){c("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===A?(A=!0,c("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(A=!1,0<V.length){var n=V.shift();wx.getLocalImgData(n)}},e))):V.push(e)},getNetworkType:function(e){c("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){c("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){c(p.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){c("hideOptionMenu",{},e)},showOptionMenu:function(e){c("showOptionMenu",{},e)},closeWindow:function(e){c("closeWindow",{},e=e||{})},hideMenuItems:function(e){c("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){c("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){c("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){c("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){c("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(_){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){c(p.openAddress,{},(e._complete=function(e){var n;(n=e).postalCode=n.addressPostalCode,delete n.addressPostalCode,n.provinceName=n.proviceFirstStageName,delete n.proviceFirstStageName,n.cityName=n.addressCitySecondStageName,delete n.addressCitySecondStageName,n.countryName=n.addressCountiesThirdStageName,delete n.addressCountiesThirdStageName,n.detailInfo=n.addressDetailInfo,delete n.addressDetailInfo,e=n},e))},openProductSpecificView:function(e){c(p.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}c(p.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){c("chooseCard",{app_id:M.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}c(p.openCard,{card_list:i},e)},consumeAndShareCard:function(e){c(p.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){c(p.chooseWXPay,n(e),e)},openEnterpriseRedPacket:function(e){c(p.openEnterpriseRedPacket,n(e),e)},startSearchBeacons:function(e){c(p.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){c(p.stopSearchBeacons,{},e)},onSearchBeacons:function(e){i(p.onSearchBeacons,e)},openEnterpriseChat:function(e){c("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){c("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},miniProgram:{navigateBack:function(e){e=e||{},u(function(){c("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){u(function(){c("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){u(function(){c("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){u(function(){c("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){u(function(){c("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){u(function(){c("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){u(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},L=1,B={};return t.addEventListener("error",function(e){if(!y){var n=e.target,i=n.tagName,t=n.src;if(("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)&&-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=L++,n["wx-id"]=o),B[o])return;B[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),t.addEventListener("load",function(e){if(!y){var n=e.target,i=n.tagName;if(n.src,"IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(B[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=C),C}var O});
\ No newline at end of file
diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json
index 4f3cd45..5b6160e 100644
--- a/node_modules/jweixin-module/package.json
+++ b/node_modules/jweixin-module/package.json
@@ -1,41 +1,40 @@
 {
-  "_from": "jweixin-module",
-  "_id": "jweixin-module@1.4.1",
+  "_args": [
+    [
+      "jweixin-module@1.6.0",
+      "D:\\Web-Object\\rush-goods"
+    ]
+  ],
+  "_from": "jweixin-module@1.6.0",
+  "_id": "jweixin-module@1.6.0",
   "_inBundle": false,
-  "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==",
+  "_integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
   "_location": "/jweixin-module",
   "_phantomChildren": {},
   "_requested": {
-    "type": "tag",
+    "type": "version",
     "registry": true,
-    "raw": "jweixin-module",
+    "raw": "jweixin-module@1.6.0",
     "name": "jweixin-module",
     "escapedName": "jweixin-module",
-    "rawSpec": "",
+    "rawSpec": "1.6.0",
     "saveSpec": null,
-    "fetchSpec": "latest"
+    "fetchSpec": "1.6.0"
   },
   "_requiredBy": [
-    "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
-  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
-  "_spec": "jweixin-module",
-  "_where": "E:\\demo\\niushop_uniapp",
+  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+  "_spec": "1.6.0",
+  "_where": "D:\\Web-Object\\rush-goods",
   "author": {
     "name": "Shengqiang Guo"
   },
   "bugs": {
     "url": "https://github.com/zhetengbiji/jweixin-module/issues"
   },
-  "bundleDependencies": false,
-  "deprecated": false,
   "description": "微信JS-SDK",
-  "devDependencies": {
-    "textfile": "^1.2.0",
-    "uglify-js": "^3.4.9"
-  },
+  "devDependencies": {},
   "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
   "keywords": [
     "wxjssdk",
@@ -46,15 +45,12 @@
     "wx"
   ],
   "license": "ISC",
-  "main": "out/index.js",
+  "main": "lib/index.js",
   "name": "jweixin-module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
   },
-  "scripts": {
-    "build": "node build",
-    "prepublish": "npm run build"
-  },
-  "version": "1.4.1"
+  "scripts": {},
+  "version": "1.6.0"
 }
diff --git a/package-lock.json b/package-lock.json
index 08c4360..d0c25e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,10 +2,55 @@
 	"requires": true,
 	"lockfileVersion": 1,
 	"dependencies": {
-		"mescroll-uni": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/mescroll-uni/-/mescroll-uni-1.1.8.tgz",
-			"integrity": "sha512-l1JJP6NVc5pCkojNWz7U1kcdw7f40ZDS1PGJ8NEI5/TDn22AKahLQJCdKTWwpx+jOZWX+aSiwFsIvcz11cnidQ=="
+		"@babel/runtime": {
+			"version": "7.19.4",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz",
+			"integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==",
+			"requires": {
+				"regenerator-runtime": "^0.13.4"
+			}
+		},
+		"@vant/icons": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
+			"integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
+		},
+		"@vant/popperjs": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.3.0.tgz",
+			"integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw=="
+		},
+		"@vue/babel-helper-vue-jsx-merge-props": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
+			"integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA=="
+		},
+		"jweixin-module": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+			"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+		},
+		"regenerator-runtime": {
+			"version": "0.13.10",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
+			"integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+		},
+		"vant": {
+			"version": "2.12.51",
+			"resolved": "https://registry.npmjs.org/vant/-/vant-2.12.51.tgz",
+			"integrity": "sha512-0dZHcBWwKdQvgvAMr5hqObuwkHRn51c7ReLVDV/Ijp1twZ/9/JGMPKVCp1ebpzFAONudyDvu42adrkFUhheaUA==",
+			"requires": {
+				"@babel/runtime": "7.x",
+				"@vant/icons": "^1.7.1",
+				"@vant/popperjs": "^1.1.0",
+				"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+				"vue-lazyload": "1.2.3"
+			}
+		},
+		"vue-lazyload": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
+			"integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
 		}
 	}
 }
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..342d485
--- /dev/null
+++ b/package.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "vant": "^2.12.51",
+    "jweixin-module": "^1.4.1"
+  }
+}
diff --git a/pages.json b/pages.json
index c249374..47849a3 100644
--- a/pages.json
+++ b/pages.json
@@ -931,7 +931,59 @@
 						// #endif
 						"navigationBarTitleText": "分销商"
 					}
+				},
+				{
+					"path": "fenxiao/apply_upgrade",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "分销商升级申请"
+					}
+				},
+				//****************** 文章 ******************
+				{
+					"path": "article/list",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "文章"
+					}
+				},
+				{
+					"path": "article/record",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "文章"
+					}
+				},
+				{
+					"path": "article/detail",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "文章"
+					}
+				},
+				//****************** 交易市场 ******************
+				{
+					"path": "futures/list",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "交易市场"
+					}
 				}
+
+
+
+
+
 			]
 		},
 		{
diff --git a/pages_promotion/article/detail.vue b/pages_promotion/article/detail.vue
new file mode 100644
index 0000000..1924afc
--- /dev/null
+++ b/pages_promotion/article/detail.vue
@@ -0,0 +1,530 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page">
+    <loading-cover v-if="loading" ref="loadingCover"></loading-cover>
+    <!--文章标题-->
+    <view class="help-title">{{ detail.article_title }}</view>
+    <view class="help-meta">
+      <text class="help-time">发表时间: {{ detail.create_time }}</text>
+    </view>
+    <!--用户信息  存在分享人则显示分享人信息，不存在则显示本人信息 -->
+<!--    <view class="user">-->
+<!--      <view class="avatar" @click="goToPage">-->
+<!--        <image class="avatar-image" :src="$util.img(member.headimg)"></image>-->
+<!--      </view>-->
+<!--      <view class="info" @click="goToPage">-->
+<!--        <view class="nickname">{{ member.nickname }}</view>-->
+<!--        <view class="phone">{{ member.mobile }}</view>-->
+<!--      </view>-->
+<!--      <view class="btn">-->
+<!--        &lt;!&ndash;判断：当前用户存在推荐人且本人不是分销商-显示推荐人信息，不存在推荐人或者本人是分销商-显示本人信息； 当：本人不是分销商或者会员卡已过期-显示升级名片，本人是分销商且会员卡未过期-显示我要推广&ndash;&gt;-->
+<!--        <view class="btn-item" v-if="member.show_type === 'upgrade'" @click="onUpgrade">升级名片</view>-->
+<!--        <view class="btn-item" v-else @click="share_panel = true">我要分享</view>-->
+<!--      </view>-->
+<!--    </view>-->
+    <!--文章内容-->
+    <view class="help-content">
+      <rich-text :nodes="content"></rich-text>
+    </view>
+    <!--浏览量和点赞-->
+    <view class="bottom">
+      <view class="browse">{{ set_info.browse_text || '浏览量' }}{{ detail.read_num }}次数</view>
+      <view class="bottom-list">
+        <view class="fabulous" @click="fabulous">
+          <van-icon v-if="detail.is_fabulous > 0" class="good-job" name="good-job" />
+          <van-icon v-else class="good-job-o" name="good-job-o" />
+          赞 {{ detail.dianzan_num }}
+        </view>
+        <view class="share_panel" @click="share_panel = true"><image class="my-icon" src="./public/img/fenxiang.png"></image>分享</view>
+      </view>
+    </view>
+    <!-- 推荐阅读 -->
+    <view class="recommend">
+      <!--顶部内容-->
+      <view class="top">
+        <view class="title">推荐阅读</view>
+        <view class="more-info" @click="$util.redirectTo('/pages_promotion/article/list')">
+          查看更多<van-icon class="arrow" name="arrow" />
+        </view>
+      </view>
+      <!--推荐列表-->
+      <view class="article">
+        <van-list v-model="list_loading" :finished="finished" finished-text="" @load="getList">
+          <view class="article-block" v-for="(item,index) in list" :key="index" @click="goToDetail(item.article_id)">
+
+            <view class="block-content">
+              <view class="content-title">{{ item.article_title }}</view>
+              <view class="content-abstract">{{ item.article_abstract }}</view>
+              <view class="content-info">
+                <view class="content-info-item">
+                  <image class="my-icon" src="./public/img/liulan.png"></image>
+                  {{ item.read_num }}
+                </view>
+                <view class="content-info-item">
+                  <image class="my-icon" src="./public/img/dianzan.png"></image>
+                  {{ item.dianzan_num }}
+                </view>
+                <view class="content-info-item" style="width: 160rpx">{{ item.create_time.split(" ")[0] }}</view>
+              </view>
+            </view>
+            <view class="img">
+              <image class="image" :src="$util.img(item.cover_img)"></image>
+            </view>
+          </view>
+        </van-list>
+      </view>
+    </view>
+	</view>
+  <!-- 底部tabBar -->
+  <view class="page-bottom"><diy-bottom-nav></diy-bottom-nav></view>
+  <!--分享面板-->
+  <share :show="share_panel" @close="share_panel = false" :share="share_info" :shareParams="share_params"></share>
+</template>
+
+<script>
+import htmlParser from '@/common/js/html-parser';
+import share from '@/components/share-panel/share-panel';
+
+export default {
+  components:{
+    share
+  },
+	data() {
+		return {
+      set_info: {},
+      loading: true,
+			articleId: 0,
+			detail: {},
+			content: '',
+      share_panel: false,
+      member_id: 0,
+      member:{},
+
+      page: 1 ,
+      list: [],
+      list_loading: false, // 是否处于加载状态，加载过程中不触发load事件
+      finished: false, // 是否已加载完成，加载完成后不再触发load事件
+
+      share_info:{},
+      share_params: [
+          'article_id'
+      ],
+
+      source_member: 0,
+		};
+	},
+	onLoad(options) {
+		this.articleId = options.article_id || 0;
+		if (this.articleId == 0) {
+			this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
+			return;
+		}
+    // 分享奖励
+    if(options.source_member && options.share_id) this.shareReward(options);
+    // 分享接收 source_member
+    if (options.source_member) uni.setStorageSync('source_member', options.source_member);
+    // 获取数据
+    this.getData();
+	},
+	onShow() {
+    //记录分享关系
+    if(uni.getStorageSync('token') && uni.getStorageSync('source_member')){
+      this.$util.onSourceMember(uni.getStorageSync('source_member'));
+    }
+  },
+  mounted() {
+    this.getSetting()
+  },
+  methods: {
+    // 获取文章详情
+		getData() {
+      let _this = this;
+      let source_member = uni.getStorageSync('source_member') || 0;
+
+      _this.$api.sendRequest({
+				url: '/article/api/index/details',
+				data: { article_id: _this.articleId, source_member: source_member },
+				success: res => {
+					if (res.code === 0 && res.data) {
+            _this.detail = res.data;
+            // _this.member = res.member;
+            _this.$langConfig.title(this.detail.article_title);
+            _this.content = htmlParser(this.detail.article_content);
+
+            _this.share_info = {
+              title: _this.detail.article_title, // 分享标题
+              desc: _this.detail.article_abstract, // 分享描述
+              imgUrl: _this.detail.cover_img, // 分享图标
+            };
+					}
+          else {
+						this.$util.showToast({
+							title: res.message
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_promotion/article/list', {}, 'redirectTo');
+						}, 2000);
+					}
+
+          _this.loading = false;
+				},
+				fail: res => {
+          _this.loading = false;
+				}
+			});
+		},
+    // 点击升级名片
+    onUpgrade(){
+      if(this.member.level_expire_time > 0) this.$util.redirectTo('/pages_tool/member/card')
+      else this.$util.redirectTo('/pages_tool/member/card_buy')
+    },
+    // 点击进入名片
+    goToPage(){
+      this.$util.redirectTo('/pages_promotion/card/homepage')
+    },
+    // 获取基本设置
+    getSetting(){
+      let _this = this;
+      this.$api.sendRequest({
+        url: '/article/api/index/setInfo',
+        success: res => {
+          if(res.code === 0){
+            _this.set_info = res.data;
+          }
+        },
+        fail: res => {
+          console.log(res);
+        }
+      });
+    },
+    // 点击点赞按钮
+    fabulous(){
+      let _this = this;
+      _this.$api.sendRequest({
+        url: '/article/api/index/fabulous',
+        data: { article_id: _this.articleId },
+        success: res => {
+          this.$util.showToast({
+            title: res.message
+          });
+          if (res.code === 0) _this.getData();
+        },
+        fail: res => {}
+      });
+    },
+    // 获取文章列表
+    getList(){
+      let _this = this;
+      this.list_loading = true;
+      _this.$api.sendRequest({
+        url: '/article/api/index/articleList',
+        data: {
+          page_size: 10,
+          page: _this.page,
+          is_rand: 1,
+        },
+        success: res => {
+          if(res.code === 0){
+            _this.list_loading = false;
+            let data = res.data;
+
+            if(_this.page === 1) _this.list = data.list;
+            else _this.list = _this.list.concat(data.list);
+            _this.page++;
+            // 推荐列表 仅加载一页
+            _this.finished = true;
+          }
+        },
+        fail: res => {
+          console.log(res);
+        }
+      });
+    },
+    // 点击跳转 —— 文章详情
+    goToDetail(id) {
+      this.$util.redirectTo('/pages_promotion/article/detail', { article_id: id });
+    },
+    // 获取分享奖励
+    shareReward(options){
+      this.$api.sendRequest({
+        url: '/article/api/index/getShareReward',
+        data: options,
+        success: res => {
+          console.log(res);
+        },
+        fail: res => {
+          console.log('分享奖励失败',res);
+        }
+      });
+    }
+	},
+	onShareAppMessage(res) {
+		var title = this.detail.article_title;
+		var path = '/pages_promotion/article/detail?article_id=' + this.articleId;
+		return {
+			title: title,
+			path: path,
+			success: res => {},
+			fail: res => {}
+		};
+	}
+};
+</script>
+
+<style lang="scss">
+.page {
+	width: 100%;
+	height: 100%;
+	padding: 30rpx;
+	box-sizing: border-box;
+	background: #ffffff;
+  user-select: auto;
+  .help-title {
+    font-size: 40rpx;
+    font-weight: bold;
+    text-align: left;
+    line-height: 60rpx;
+  }
+  .help-content {
+    margin-top: $margin-updown;
+    word-break: break-all;
+    user-select: auto;
+  }
+  .help-meta {
+    text-align: right;
+    margin-top: $margin-updown;
+    color: $color-tip;
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    width: 100%;
+    .share-o{
+      margin-right: 6rpx;
+    }
+
+    .help-time {
+      font-size: $font-size-tag;
+    }
+  }
+  .user{
+    margin: 40rpx 0;
+    background: #f6f7fb;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    width: calc(100% - 60rpx);
+    height: 120rpx;
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: center;
+    .avatar{
+      height: 120rpx;
+      width: 120rpx;
+
+      .avatar-image{
+        width: 100%;
+        height: 100%;
+        border-radius: 50%;
+      }
+    }
+    .info{
+      width: calc(100% - 120rpx - 170rpx);
+      padding-left: 20rpx;
+
+      .nickname{
+        font-size: 30rpx;
+        font-weight: bold;
+      }
+      .phone{
+        font-size: 26rpx;
+      }
+    }
+    .btn{
+      width: 170rpx;
+      .btn-item{
+        background: #de3242;
+        border-radius: 40rpx;
+        width: 160rpx;
+        text-align: center;
+        height: 60rpx;
+        line-height: 60rpx;
+        font-size: 28rpx;
+        color: #FFF;
+      }
+    }
+
+
+  }
+  .bottom{
+    margin: 30rpx 0;
+    font-size: 26rpx;
+    display: inline-flex;
+    width: 100%;
+    height: 60rpx;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: center;
+    .browse{
+      color: #909399;
+    }
+    .bottom-list{
+      display: flex;
+      justify-content: space-between;
+      width: 280rpx;
+      .fabulous{
+        color: #909399;
+        border: 1px solid #dddddd;
+        border-radius: 100rpx;
+        height: 50rpx;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        padding: 0 30rpx;
+
+        .good-job-o{
+          color: #909399;
+          font-size: 34rpx;
+          margin-right: 10rpx;
+        }
+        .good-job{
+          color: #e02e42;
+          font-size: 34rpx;
+          margin-right: 10rpx;
+        }
+      }
+      .share_panel{
+        line-height: 64rpx;
+        color: #909399;
+      }
+    }
+  }
+  .recommend{
+    .top{
+      width: 100%;
+      display: inline-flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 60rpx;
+      line-height: 60rpx;
+      margin: 50rpx 0;
+      position: relative;
+
+      .title{
+        padding-left: 30rpx;
+        font-size: 26rpx;
+      }
+      .title::after{
+        content: "";
+        position: absolute;
+        left: 0;
+        top: 14rpx;
+        width: 6rpx;
+        height: calc(100% - (14rpx * 2));
+        background: #527010;
+      }
+      .more-info{
+        font-size: 26rpx;
+        color: #8f9298;
+        .arrow{}
+      }
+    }
+    .article{
+      .article-block{
+        width: 100%;
+        padding: 20rpx 0;
+        display: inline-flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-items: center;
+        justify-content: space-between;
+        height: 180rpx;
+        position: relative;
+        .img{
+          width: 260rpx;
+          height: 180rpx;
+          border-radius: 20rpx;
+          overflow: hidden;
+          .image{
+            width: 100%;
+            height: 100%;
+          }
+        }
+        .block-content{
+          width: calc(100% - 290rpx);
+          height: 100%;
+          display: inline-flex;
+          flex-wrap: wrap;
+          flex-direction: column;
+          justify-content: space-between;
+          align-items: flex-start;
+
+          .content-title{
+            width: 100%;
+            font-size: 30rpx;
+            font-weight: bold;
+            line-height: 40rpx;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+          }
+          .content-abstract{
+            height: 40rpx;
+            width: 100%;
+            overflow: hidden;
+            white-space: nowrap;
+            //text-align: center;
+            font-size: 24rpx;
+            //font-weight: bold;
+            line-height: 40rpx;
+            text-overflow: ellipsis;
+            display: block;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+          }
+          .content-info{
+            width: 100%;
+            display: inline-flex;
+            justify-content: flex-start;
+            flex-direction: row;
+            flex-wrap: nowrap;
+            align-items: flex-end;
+            .content-info-item{
+              width: 85rpx;
+              font-size: 26rpx!important;
+              color: #999999;
+            }
+          }
+        }
+      }
+      .article-block::after{
+        content: "";
+        position: absolute;
+        width: calc(100% - 40rpx);
+        height: 1px;
+        bottom: 0;
+        left: 20rpx;
+        background: #f5f5f5;
+      }
+    }
+  }
+
+}
+
+.my-icon {
+  top: 3px;
+  height: 15px;
+  width: 15px;
+  position: relative;
+  display: inline-block;
+  font: normal normal normal 14px/1 'vant-icon';
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+}
+
+</style>
diff --git a/pages_promotion/article/list.vue b/pages_promotion/article/list.vue
new file mode 100644
index 0000000..5ec4835
--- /dev/null
+++ b/pages_promotion/article/list.vue
@@ -0,0 +1,728 @@
+<template>
+  <!--<loading-cover v-if="loading" ref="loadingCover"></loading-cover>-->
+	<page-meta :page-style="themeColor"></page-meta>
+	<view id="articleList">
+    <!--搜索框-->
+<!--    <van-search shape="round" v-model="search_title" show-action placeholder="请输入文章标题">-->
+<!--      <template #action>-->
+<!--        <view class="search" @click="goToSign">-->
+<!--          <view class="img">-->
+<!--            <image :src="$util.img('public/picture/aijiu/sign.png')" mode="aspectFit"></image>-->
+<!--          </view>-->
+<!--          <view class="sign-button">签到</view>-->
+<!--        </view>-->
+<!--      </template>-->
+<!--    </van-search>-->
+    <!--分类标题栏-->
+    <view class="top-buttons">
+      <view class="cate">
+        <van-tabs v-model="cate_ids" scrollspy :swipe-threshold="3"  color="#527010">
+          <van-tab v-for="(item,index) in cate_list" :key="index" :name="item.category_id" :title="item.category_name"></van-tab>
+        </van-tabs>
+      </view>
+<!--      <view class="sort">-->
+<!--        <van-dropdown-menu>-->
+<!--          <van-dropdown-item v-model="sort_value" :options="sort_list" />-->
+<!--        </van-dropdown-menu>-->
+<!--      </view>-->
+    </view>
+    <!--轮播图-->
+    <van-swipe v-if="set_info.banner_list && cate_ids === 'recommend'" class="swipe" :autoplay="3000" indicator-color="white">
+      <van-swipe-item v-for="item in set_info.banner_list">
+        <image class="image-item" :src="$util.img(item)" mode="aspectFit"></image>
+      </van-swipe-item>
+    </van-swipe>
+    <!-- hot阅读 -->
+    <view class="hot" v-if="cate_ids === 'recommend'">
+      <!--顶部内容-->
+      <view class="top">
+        <view class="title">热门文章</view>
+      </view>
+      <!--推荐列表-->
+      <view class="article">
+        <scroll-view scroll-x="true">
+          <view class="article-block" v-for="(item,index) in hot_list" :key="index" @click="goToDetail(item.article_id)">
+            <view class="img">
+              <image class="image" :src="$util.img(item.cover_img)"></image>
+            </view>
+            <view class="block-content">
+              <view class="content-title">{{ item.article_title }}</view>
+              <view class="content-abstract">{{ item.article_abstract }}</view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+    <!-- 推荐阅读 -->
+    <view class="recommend" v-if="cate_ids === 'recommend'">
+      <!--顶部内容-->
+      <view class="top">
+        <view class="title">精选推荐</view>
+        <view class="more-info" @click="cate_ids = 'recommend-list'">
+          查看更多<van-icon class="arrow" name="arrow" />
+        </view>
+      </view>
+      <!--推荐列表-->
+      <view class="article">
+        <van-list v-model="list_loading" :finished="finished" finished-text="" @load="getList">
+          <view class="article-block" v-for="(item,index) in recommend_list" :key="index" @click="goToDetail(item.article_id)">
+
+            <view class="block-content">
+              <view class="content-title">{{ item.article_title }}</view>
+              <view class="content-abstract">{{ item.article_abstract }}</view>
+              <view class="content-info">
+                <view class="content-info-item">
+                  <image class="my-icon" src="./public/img/liulan.png"></image>
+                  {{ item.read_num }}
+                </view>
+                <view class="content-info-item">
+                  <image class="my-icon" src="./public/img/dianzan.png"></image>
+                  {{ item.dianzan_num }}
+                </view>
+                <view class="content-info-item" style="width: 160rpx">{{ item.create_time.split(" ")[0] }}</view>
+              </view>
+            </view>
+            <view class="img">
+              <image class="image" :src="$util.img(item.cover_img)"></image>
+            </view>
+          </view>
+        </van-list>
+      </view>
+    </view>
+    <!--文章列表-->
+    <view class="article" v-if="cate_ids !== 'recommend'">
+      <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="getList">
+        <view class="article-block" v-for="(item,index) in list" :key="index" @click="goToDetail(item.article_id)">
+          <view class="block-content">
+            <view class="content-title">{{ item.article_title }}</view>
+            <view class="content-abstract">{{ item.article_abstract }}</view>
+            <view class="content-info">
+              <view class="content-info-item">
+                <image class="my-icon" src="./public/img/liulan.png"></image>
+                {{ item.read_num }}
+              </view>
+              <view class="content-info-item">
+                <image class="my-icon" src="./public/img/dianzan.png"></image>
+                {{ item.dianzan_num }}
+              </view>
+              <view class="content-info-item" style="width: 160rpx">{{ item.create_time.split(" ")[0] }}</view>
+            </view>
+          </view>
+          <view class="img">
+            <image class="image" :src="$util.img(item.cover_img)"></image>
+          </view>
+        </view>
+      </van-list>
+    </view>
+  </view>
+  <!-- 底部tabBar -->
+  <view class="page-bottom"><diy-bottom-nav></diy-bottom-nav></view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+      cate_list: [],
+      set_info: [],
+			list: [],
+      hot_list: [],
+      recommend_list: [],
+      loading: false, // 是否处于加载状态，加载过程中不触发load事件
+      finished: false, // 是否已加载完成，加载完成后不再触发load事件
+      // 排序内容
+      sort_value: 'new',
+      sort_list: [
+        { text: '最新', value: 'new' },
+        { text: '推荐', value: 'recommend' },
+        { text: '热门', value: 'hot' },
+        { text: '点赞', value: 'fabulous' },
+      ],
+      // 列表相关
+      page: 1,
+      search_title: '',
+      cate_ids: 'recommend',
+		};
+	},
+	onShow() {},
+  watch:{
+    'search_title':{
+      handler() {
+        this.page = 1;
+        this.list = [];
+        this.getList();
+      }
+    },
+    'cate_ids':{
+      handler() {
+        this.page = 1;
+        this.list = [];
+        this.getList();
+      }
+    },
+    'sort_value':{
+      handler() {
+        this.page = 1;
+        this.list = [];
+        this.getList();
+      }
+    },
+  },
+  mounted() {
+    this.getCateList();
+    this.getSetting();
+    this.getHotList();
+    this.getRecommendList();
+  },
+  methods: {
+    // 获取文章分类
+    getCateList(){
+      let _this = this;
+      this.$api.sendRequest({
+        url: '/article/api/index/cateList',
+        success: res => {
+          if(res.code === 0){
+            let list = [
+              {category_id: 'recommend', category_name: '推荐'},
+              // {category_id: '', category_name: '全部'}
+            ];
+            _this.cate_list = list.concat(res.data);
+            _this.cate_list = _this.cate_list.concat([
+              {category_id: 'recommend-list', category_name: '精选推荐'}
+            ])
+          }else {
+            this.$util.showToast({
+              title: res.message
+            });
+          }
+        },
+        fail: res => {
+          console.log(res);
+        }
+      });
+    },
+    // 获取基本设置
+    getSetting(){
+      let _this = this;
+      this.$api.sendRequest({
+        url: '/article/api/index/setInfo',
+        success: res => {
+          if(res.code === 0){
+            let data = res.data;
+            data.banner_list = JSON.parse(data.banner_list);
+
+            _this.set_info = res.data;
+          }
+        },
+        fail: res => {
+          console.log(res);
+        }
+      });
+    },
+    // 获取文章列表
+    getList(){
+      let _this = this;
+      this.loading = true;
+      _this.$api.sendRequest({
+        url: '/article/api/index/articleList',
+        data: {
+          page_size: 10,
+          page: _this.page,
+          search_text: _this.search_title,
+          cate_ids: _this.cate_ids === 'recommend-list' ? '' : _this.cate_ids,
+          orders: _this.sort_value,
+          is_recommend: _this.cate_ids === 'recommend-list' ? 1 : 0
+        },
+        success: res => {
+          if(res.code === 0){
+            _this.loading = false;
+            let data = res.data;
+
+            if(_this.page === 1) _this.list = data.list;
+            else _this.list = _this.list.concat(data.list);
+            _this.page++;
+            // 加载完成  判断是否为最后一页
+            if (_this.page > data.page_count) _this.finished = true;
+          }
+        },
+        fail: res => {
+          console.log(res);
+        }
+      });
+    },
+    // 获取热门文章列表
+    getHotList(){
+      let _this = this;
+      this.loading = true;
+      _this.$api.sendRequest({
+        url: '/article/api/index/articleList',
+        data: {
+          page_size: 10,
+          is_hot: 1,
+          page: 1,
+          search_text: '',
+          cate_ids: '',
+          orders: ''
+        },
+        success: res => {
+          if(res.code === 0){
+            _this.loading = false;
+            let data = res.data;
+            _this.hot_list = _this.list.concat(data.list);
+          }
+        },
+        fail: res => {
+          console.log(res);
+        }
+      });
+    },
+    // 获取推荐文章列表
+    getRecommendList(){
+      let _this = this;
+      this.loading = true;
+      _this.$api.sendRequest({
+        url: '/article/api/index/articleList',
+        data: {
+          page_size: 10,
+          is_recommend: 1,
+          page: 1,
+          search_text: '',
+          cate_ids: '',
+          orders: ''
+        },
+        success: res => {
+          if(res.code === 0){
+            _this.loading = false;
+            let data = res.data;
+            _this.recommend_list = _this.list.concat(data.list);
+          }
+        },
+        fail: res => {
+          console.log(res);
+        }
+      });
+    },
+    // 点击跳转 —— 文章详情
+		goToDetail(id) {
+			this.$util.redirectTo('/pages_promotion/article/detail', { article_id: id });
+		},
+    // 点击跳转 —— 签到
+    goToSign() {
+      this.$util.redirectTo('/pages_tool/member/signin');
+    }
+  },
+	onShareAppMessage(res) {
+		var title = '文章列表';
+		var path = '/pages_promotion/article/list';
+		return {
+			title: title,
+			path: path,
+			success: res => {},
+			fail: res => {}
+		};
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ .van-search__content{
+  background-color: #f0f0f0;
+}
+#articleList{
+  padding: 0 10px;
+  background: #ffffff;
+  .search{
+    width: 70rpx;
+    height: 70rpx;
+    text-align: center;
+    display: inline-flex;
+    flex-wrap: wrap;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: stretch;
+    .img{
+      image{
+        width: 100%;
+        height: 34rpx;
+        display: block;
+      }
+    }
+    .sign-button{
+      height: 30rpx;
+      font-size: 26rpx;
+      line-height: 30rpx;
+    }
+  }
+  .top-buttons{
+    height: 90rpx;
+    width: 100%;
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-content: center;
+    align-items: flex-end;
+
+    .cate{
+      height: 100%;
+      //width: calc(100% - 150rpx);
+      width: 100%;
+
+      /deep/ .van-tabs{
+        height: 100%;
+        .van-tabs__wrap{
+          height: 100%;
+        }
+      }
+    }
+    .sort{
+      --sort-width--: 140rpx;
+      height: 100%;
+      width: var(--sort-width--);
+      position: relative;
+      display: inline-flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      justify-content: center;
+      align-items: flex-start;
+
+      /deep/ .van-dropdown-menu{
+        height: 100%!important;
+        width: var(--sort-width--);
+        .van-dropdown-menu__bar{
+          height: 100%!important;
+          width: var(--sort-width--);
+        }
+      }
+    }
+    .sort::after{
+      content: "";
+      position: absolute;
+      left: 0;
+      top: calc((100% - 60rpx) / 2);
+      width: 4rpx;
+      height: 60rpx;
+      background: #999999;
+    }
+
+  }
+  .swipe{
+    width: 100%;
+    height: calc(100vw / 2);
+    padding: 0;
+    margin: 20rpx 0;
+
+    .image-item{
+      width: 100%;
+      height: 100%;
+      border-radius: 20rpx;
+      /deep/ div{
+        background-size: 100% 100% !important;
+      }
+    }
+  }
+  .article{
+    .article-block{
+      width: 100%;
+      padding: 20rpx 0;
+      display: inline-flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      align-items: center;
+      justify-content: space-between;
+      height: 180rpx;
+      position: relative;
+      .img{
+        width: 260rpx;
+        height: 180rpx;
+        border-radius: 20rpx;
+        overflow: hidden;
+        .image{
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .block-content{
+        width: calc(100% - 290rpx);
+        height: 100%;
+        display: inline-flex;
+        flex-wrap: wrap;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: flex-start;
+
+        .content-title{
+          width: 100%;
+          font-size: 30rpx;
+          font-weight: bold;
+          line-height: 40rpx;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+        }
+        .content-abstract{
+          height: 40rpx;
+          width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          //text-align: center;
+          font-size: 24rpx;
+          //font-weight: bold;
+          line-height: 40rpx;
+          text-overflow: ellipsis;
+          display: block;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+        }
+        .content-info{
+          width: 100%;
+          display: inline-flex;
+          justify-content: flex-start;
+          flex-direction: row;
+          flex-wrap: nowrap;
+          align-items: flex-end;
+          .content-info-item{
+            width: 85rpx;
+            font-size: 26rpx!important;
+            color: #999999;
+          }
+        }
+      }
+    }
+    .article-block::after{
+      content: "";
+      position: absolute;
+      width: calc(100% - 40rpx);
+      height: 1px;
+      bottom: 0;
+      left: 20rpx;
+      background: #f5f5f5;
+    }
+  }
+  .recommend{
+    .top{
+      width: 100%;
+      display: inline-flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 60rpx;
+      line-height: 60rpx;
+      margin: 50rpx 0 10rpx 0;
+      position: relative;
+
+      .title{
+        padding-left: 20rpx;
+        font-size: 36rpx;
+        font-weight: 900;
+
+      }
+      //.title::after{
+      //  content: "";
+      //  position: absolute;
+      //  left: 0;
+      //  top: 14rpx;
+      //  width: 6rpx;
+      //  height: calc(100% - (14rpx * 2));
+      //  background: #e02e42;
+      //}
+      .more-info{
+        font-size: 26rpx;
+        color: #8f9298;
+        .arrow{}
+      }
+    }
+    .article{
+      .article-block{
+        width: 100%;
+        padding: 20rpx 0;
+        display: inline-flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-items: center;
+        justify-content: space-between;
+        height: 180rpx;
+        position: relative;
+        .img{
+          width: 260rpx;
+          height: 180rpx;
+          border-radius: 20rpx;
+          overflow: hidden;
+          .image{
+            width: 100%;
+            height: 100%;
+          }
+        }
+        .block-content{
+          width: calc(100% - 290rpx);
+          height: 100%;
+          display: inline-flex;
+          flex-wrap: wrap;
+          flex-direction: column;
+          justify-content: space-between;
+          align-items: flex-start;
+
+          .content-title{
+            width: 100%;
+            font-size: 30rpx;
+            font-weight: bold;
+            line-height: 40rpx;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+          }
+          .content-abstract{
+            height: 40rpx;
+            width: 100%;
+            overflow: hidden;
+            white-space: nowrap;
+            //text-align: center;
+            font-size: 24rpx;
+            //font-weight: bold;
+            line-height: 40rpx;
+            text-overflow: ellipsis;
+            display: block;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+          }
+          .content-info{
+            width: 100%;
+            display: inline-flex;
+            justify-content: flex-start;
+            flex-direction: row;
+            flex-wrap: nowrap;
+            align-items: flex-end;
+            .content-info-item{
+              width: 85rpx;
+              font-size: 26rpx!important;
+              color: #999999;
+            }
+          }
+        }
+      }
+      .article-block::after{
+        content: "";
+        position: absolute;
+        width: calc(100% - 40rpx);
+        height: 1px;
+        bottom: 0;
+        left: 20rpx;
+        background: #f5f5f5;
+      }
+    }
+  }
+
+  .hot{
+    .top{
+      width: 100%;
+      display: inline-flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 60rpx;
+      line-height: 60rpx;
+      margin: 50rpx 0 10rpx 0;
+      position: relative;
+
+      .title{
+        padding-left: 20rpx;
+        font-size: 36rpx;
+        font-weight: 900;
+
+      }
+      .more-info{
+        font-size: 26rpx;
+        color: #8f9298;
+        .arrow{}
+      }
+    }
+    .article{
+      white-space: nowrap;
+      width: 100%;
+      height: calc(65vw / 2);
+      .article-block{
+        display: inline-block;
+        width: 55vw;
+        padding: 20rpx 16rpx;
+        height: calc(65vw / 2);
+        .img{
+          width: 100%;
+          height:  100%;
+          border-radius: 20rpx;
+          overflow: hidden;
+          .image{
+            width: 100%;
+            height: 100%;
+          }
+        }
+        .block-content{
+          width: calc(100%);
+          height: 100%;
+          display: block;
+          position: relative;
+          top: calc(-65vw / 4 - 36rpx);
+          color: #ffffff;
+
+          .content-title{
+            margin: auto;
+            overflow: hidden;
+            /*这里要显示的设置宽度*/
+            white-space:nowrap;
+            text-align: center;
+            color: #ffffff;
+            width: 80%;
+            font-size: 32rpx;
+            font-weight: bold;
+            line-height: 40rpx;
+            text-overflow: ellipsis;
+            display: block;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+          }
+          .content-abstract{
+            margin: auto;
+            overflow: hidden;
+            margin-top: 16rpx;
+            white-space:nowrap;
+            text-align: center;
+            color: #ffffff;
+            width: 60%;
+            font-size: 24rpx;
+            //font-weight: bold;
+            line-height: 40rpx;
+            text-overflow: ellipsis;
+            display: block;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+          }
+        }
+      }
+      .article-block::after{
+        content: "";
+        position: absolute;
+        width: calc(100% - 40rpx);
+        height: 1px;
+        bottom: 0;
+        left: 20rpx;
+        background: #f5f5f5;
+      }
+    }
+  }
+}
+
+.my-icon {
+  top: 3px;
+  height: 15px;
+  width: 15px;
+  position: relative;
+  display: inline-block;
+  font: normal normal normal 14px/1 'vant-icon';
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+}
+
+
+</style>
diff --git a/pages_promotion/article/public/img/dianzan.png b/pages_promotion/article/public/img/dianzan.png
new file mode 100644
index 0000000..4280aac
Binary files /dev/null and b/pages_promotion/article/public/img/dianzan.png differ
diff --git a/pages_promotion/article/public/img/fenxiang.png b/pages_promotion/article/public/img/fenxiang.png
new file mode 100644
index 0000000..c5cad51
Binary files /dev/null and b/pages_promotion/article/public/img/fenxiang.png differ
diff --git a/pages_promotion/article/public/img/liulan.png b/pages_promotion/article/public/img/liulan.png
new file mode 100644
index 0000000..6ae1ac4
Binary files /dev/null and b/pages_promotion/article/public/img/liulan.png differ
diff --git a/pages_promotion/article/record.vue b/pages_promotion/article/record.vue
new file mode 100644
index 0000000..79c3894
--- /dev/null
+++ b/pages_promotion/article/record.vue
@@ -0,0 +1,243 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+  <view id="record">
+    <!--顶部搜索-->
+    <van-search shape="round" v-model="search_title" placeholder="请输入文章标题"></van-search>
+    <!--文章列表-->
+    <view class="article">
+      <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="recordList">
+        <view class="article-block" v-for="(item,index) in list" :key="index">
+          <view class="img" @click="goToDetail(item.article_id)">
+            <image class="image" :src="$util.img(item.cover_img)"></image>
+          </view>
+          <view class="block-content">
+            <view class="content-title" @click="goToDetail(item.article_id)">{{ item.article_title }}</view>
+            <view class="content-info">
+              <view class="content-info-item">{{ item.time }}</view>
+              <view class="content-info-item">
+                <van-button v-if="record_type === 'browse'" @click="deleteBrowseRecord(item.article_id)" class="danger-btn" type="danger" size="mini" round>
+                  删除
+                </van-button>
+                <van-button v-else-if="record_type === 'fabulous'" @click="deleteBrowseRecord(item.article_id)" class="danger-btn" type="danger" size="mini" round>
+                  取消点赞
+                </van-button>
+
+
+
+
+
+
+
+              </view>
+            </view>
+          </view>
+        </view>
+      </van-list>
+    </view>
+  </view>
+  <!-- 底部tabBar -->
+  <view class="page-bottom"><diy-bottom-nav></diy-bottom-nav></view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+      record_type: '',
+      record_type_name:{
+        'share': '分享',
+        'fabulous': '点赞',
+        'browse': '浏览',
+      },
+      // 列表相关
+      page: 1,
+      search_title: '',
+      cate_ids: '',
+      list: [],
+      loading: false, // 是否处于加载状态，加载过程中不触发load事件
+      finished: false, // 是否已加载完成，加载完成后不再触发load事件
+    };
+	},
+	onShow() {},
+  onLoad(options) {
+    // 参数获取
+    let _this = this;
+    _this.record_type = options.record_type;
+
+    // 页面标题
+    uni.setNavigationBarTitle({
+      title: _this.record_type_name[options.record_type] + '记录',
+    })
+  },
+  watch:{
+    search_title: {
+      handler: function () {
+        this.page = 1;
+        this.recordList();
+      },
+      deep: true,
+      immediate: false,
+    },
+  },
+  mounted() {
+    this.recordList();
+  },
+  methods: {
+    // 获取文章列表
+    recordList(){
+      let _this = this;
+      this.loading = true;
+      _this.$api.sendRequest({
+        url: '/article/api/index/getRecordList',
+        data: {
+          page_size: 10,
+          page: _this.page,
+          search_text: _this.search_title,
+          record_type: _this.record_type
+        },
+        success: res => {
+          if(res.code === 0){
+            _this.loading = false;
+            let data = res.data;
+
+            if(_this.page === 1) _this.list = data.list;
+            else _this.list = _this.list.concat(data.list);
+            _this.page++;
+            // 加载完成  判断是否为最后一页
+            if (_this.page > data.page_count) _this.finished = true;
+          }else{
+            this.$dialog.alert({ message: res.message }).then(res =>{
+              _this.$util.redirectTo('/pages_promotion/member/personal_center');
+            });
+          }
+        },
+        fail: res => {
+          console.log(res);
+        }
+      });
+    },
+    // 点击跳转 —— 文章详情
+    goToDetail(id) {
+      this.$util.redirectTo('/pages_promotion/article/detail', { article_id: id });
+    },
+    // 删除浏览记录、取消点赞
+    deleteBrowseRecord(article_id){
+      let _this = this;
+      let tips = '删除';
+      if(_this.record_type === 'fabulous') tips = '取消点赞';
+      _this.$dialog.confirm({ message: `确认${tips}？${tips}后不可恢复！` }).then(()=>{
+        _this.$api.sendRequest({
+          url: '/article/api/index/delRecordInfo',
+          data: {
+            record_type: _this.record_type,
+            article_id: article_id
+          },
+          success: res => {
+            this.$dialog.alert({ message: res.message }).then(()=>{
+              _this.page = 1;
+              _this.recordList();
+            });
+          },
+          fail: res => {
+            console.log(res);
+          }
+        });
+      });
+    }
+
+
+
+
+
+
+  },
+	onShareAppMessage(res) {
+		var title = '记录';
+		var path = '/pages_promotion/article/record.vue';
+		return {
+			title: title,
+			path: path,
+			success: res => {},
+			fail: res => {}
+		};
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+#record{
+  background: #ffffff; // ffffff
+  padding: 0 10px;
+
+  .article{
+    .article-block{
+      width: 100%;
+      padding: 20rpx 0;
+      display: inline-flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      align-items: center;
+      justify-content: space-between;
+      height: 180rpx;
+      position: relative;
+      .img{
+        width: 260rpx;
+        height: 180rpx;
+        border-radius: 20rpx;
+        overflow: hidden;
+        .image{
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .block-content{
+        width: calc(100% - 290rpx);
+        height: 100%;
+        display: inline-flex;
+        flex-wrap: wrap;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: flex-start;
+
+        .content-title{
+          width: 100%;
+          font-size: 30rpx;
+          font-weight: bold;
+          line-height: 40rpx;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+        }
+        .content-info{
+          width: 100%;
+          display: inline-flex;
+          justify-content: space-between;
+          flex-direction: row;
+          flex-wrap: nowrap;
+          align-items: flex-end;
+          .content-info-item{
+            font-size: 26rpx!important;
+            color: #999999;
+
+            .danger-btn{
+              padding: 0 20rpx;
+            }
+          }
+        }
+      }
+    }
+    .article-block::after{
+      content: "";
+      position: absolute;
+      width: calc(100% - 40rpx);
+      height: 1px;
+      bottom: 0;
+      left: 20rpx;
+      background: #f5f5f5;
+    }
+  }
+
+}
+</style>
diff --git a/pages_promotion/fenxiao/apply_upgrade.vue b/pages_promotion/fenxiao/apply_upgrade.vue
new file mode 100644
index 0000000..d128527
--- /dev/null
+++ b/pages_promotion/fenxiao/apply_upgrade.vue
@@ -0,0 +1,68 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="apply">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <!--加载动画-->
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+
+		};
+	},
+	components: {},
+	mixins: [],
+	onLoad(option) {
+
+	},
+	async onShow() {
+
+	},
+	methods: {
+
+
+
+
+
+
+
+
+
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') return false;
+		this.$util.redirectTo('/pages/member/index');
+		return true;
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+
+
+
+
+
+
+
+
+</style>
diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
index c34c853..f481a18 100644
--- a/pages_promotion/fenxiao/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -19,63 +19,67 @@
 						</view>
 					</view>
 				</view>
-				<view class="fenxiao-level-wrap" v-if="levelList.length">
+				<!--<view class="fenxiao-level-wrap" v-if="levelList.length">
 					<image :src="$util.img('public/uniapp/fenxiao/index/level_icon.png')" mode="heightFix" class="level-icon"></image>
 					<view class="level-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/level')">
 						<view class="title">{{ info.level_num > 0 ? info.level_name : '等级未解锁' }}</view>
 						<view class="desc">下单、邀请好友均可提升等级</view>
 					</view>
 					<view class="btn" @click="$refs.taskPopup.open()" v-if="info.condition.last_level">做任务</view>
-				</view>
+				</view>-->
+        <view class="fenxiao-level-wrap" v-if="levelList.length">
+          <image :src="$util.img('public/uniapp/fenxiao/index/level_icon.png')" mode="heightFix" class="level-icon"></image>
+          <view class="level-wrap">
+            <view class="title">{{ info.level_name }}</view>
+            <view class="desc" v-if="parseInt(info.is_apply_upgrade) === 1">提交申请可以提升等级！</view>
+          </view>
+          <view class="btn" @click="$util.redirectTo('/pages_promotion/fenxiao/apply')" v-if="parseInt(info.is_apply_upgrade) === 1">申请升级</view>
+        </view>
 			</view>
 			
-<!--			<view class="fenxiao-index-allmoney">-->
-<!--				<view class="allmoney-top-money">-->
-<!--					<view class="allmoney-top">-->
-<!--						<view class="font-size-sub">可{{ fenxiaoWords.withdraw }}（元）</view>-->
-<!--						<view class="withdrawal-record" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">提现记录<text class="iconfont icon-right"></text></view>-->
-<!--					</view>-->
-<!--					<view class="total-commission price-font">{{ info.account }}</view>-->
-<!--				</view>-->
+<!--			<view class="fenxiao-index-allmoney">
+				<view class="allmoney-top-money">
+					<view class="allmoney-top">
+						<view class="font-size-sub">可{{ fenxiaoWords.withdraw }}（元）</view>
+						<view class="withdrawal-record" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">提现记录<text class="iconfont icon-right"></text></view>
+					</view>
+					<view class="total-commission price-font">{{ info.account }}</view>
+				</view>
 
-<!--				<view class="allmoney-bottom">-->
-<!--					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">-->
-<!--						<view class="title">总{{ fenxiaoWords.account }}</view>-->
-<!--						<view class="money price-font">{{ info.total_commission | moneyFormat }}</view>-->
-<!--					</view>-->
-<!--					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">-->
-<!--						<view class="title">已提现{{ fenxiaoWords.account }}</view>-->
-<!--						<view class="money price-font">{{ info.account_withdraw | moneyFormat }}</view>-->
-<!--					</view>-->
-<!--					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">-->
-<!--						<view class="title">提现中{{ fenxiaoWords.account }}</view>-->
-<!--						<view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view>-->
-<!--					</view>-->
-<!--				</view>-->
-<!--				<view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">申请提现</view>-->
-<!--			</view>-->
+				<view class="allmoney-bottom">
+					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
+						<view class="title">总{{ fenxiaoWords.account }}</view>
+						<view class="money price-font">{{ info.total_commission | moneyFormat }}</view>
+					</view>
+					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+						<view class="title">已提现{{ fenxiaoWords.account }}</view>
+						<view class="money price-font">{{ info.account_withdraw | moneyFormat }}</view>
+					</view>
+					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+						<view class="title">提现中{{ fenxiaoWords.account }}</view>
+						<view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view>
+					</view>
+				</view>
+				<view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">申请提现</view>
+			</view>-->
 
-      <view
-          class="account-info">
-<!--          v-show="value.style == 2"-->
-<!--          :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }"-->
-
-<!--        <view class="solid"></view>-->
+<!--      <view class="account-info">
+        <view class="solid"></view>
         <view class="account-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
-          <view class="value price-font">{{ info && info.points != undefined ? info.points : '--' }}</view>
+          <view class="value price-font">{{ info && info.points != undefined ? info.points : '&#45;&#45;' }}</view>
           <view class="title">积分</view>
         </view>
         <view class="solid"></view>
         <view class="account-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
-          <view class="value price-font">{{ info && info.contribution != undefined ? info.contribution : '--' }}</view>
+          <view class="value price-font">{{ info && info.contribution != undefined ? info.contribution : '&#45;&#45;' }}</view>
           <view class="title">贡献值</view>
         </view>
         <view class="solid"></view>
         <view class="account-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
-          <view class="value price-font">{{ info && info.house_purchase != undefined ? info.house_purchase : '--' }}</view>
+          <view class="value price-font">{{ info && info.house_purchase != undefined ? info.house_purchase : '&#45;&#45;' }}</view>
           <view class="title">购房券</view>
         </view>
-      </view>
+      </view>-->
 
 			<view class="fenxiao-team">
 				<view class="fenxiao-index-other">
diff --git a/pages_promotion/futures/list.vue b/pages_promotion/futures/list.vue
new file mode 100644
index 0000000..65e3821
--- /dev/null
+++ b/pages_promotion/futures/list.vue
@@ -0,0 +1,68 @@
+<template>
+  <page-meta :page-style="themeColor"></page-meta>
+  <view class="apply">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <!--加载动画-->
+    <loading-cover ref="loadingCover"></loading-cover>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+
+    };
+  },
+  components: {},
+  mixins: [],
+  onLoad(option) {
+
+  },
+  async onShow() {
+
+  },
+  methods: {
+
+
+
+
+
+
+
+
+
+  },
+  onBackPress(options) {
+    if (options.from === 'navigateBack') return false;
+    this.$util.redirectTo('/pages/member/index');
+    return true;
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+
+
+
+
+
+
+
+
+</style>