diff --git a/api/index.js b/api/index.js
index 74f465f..b22ac5b 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,5 +1,102 @@
 import { request } from './request'
-const api = {
+const api = {
+	//获取当前用户得聊天好友列表
+	findFrindList(data) {
+		return request({
+			url: 'api/user/findFrindList',
+			method: 'post',
+			data
+		})
+	},
+	//系统消息列表
+	systemNoticeList(data) {
+		return request({
+			url: 'api/systemNoticeList',
+			method: 'post',
+			data
+		})
+	},
+	//新增城市合作
+	urbanCooperation(data) {
+		return request({
+			url: 'api/user/urbanCooperation',
+			method: 'post',
+			data
+		})
+	},
+	
+	//新增意见反馈
+	feedback(data) {
+		return request({
+			url: 'api/user/feedback',
+			method: 'post',
+			data
+		})
+	},
+	//意见反馈列表
+	feedbackList(data) {
+		return request({
+			url: 'api/user/feedbackList',
+			method: 'post',
+			data
+		})
+	},
+	//帮助中心
+	helpCenter(data) {
+		return request({
+			url: 'api/helpCenter',
+			method: 'get',
+			data
+		})
+	},
+	//关闭青少年
+	async closeTeenageMode(data) {
+		return request({
+			url: 'api/user/closeTeenageMode',
+			method: 'post',
+			data
+		})
+	},
+	//开启青少年
+	async openTeenageMode(data) {
+		return request({
+			url: 'api/user/openTeenageMode',
+			method: 'post',
+			data
+		})
+	},
+	//注销
+	async cancelAccount(data) {
+		return request({
+			url: 'api/user/cancelAccount',
+			method: 'post',
+			data
+		})
+	},
+	//隐私&消息通知
+	async privacyConfig(data) {
+		return request({
+			url: 'api/user/privacyConfig',
+			method: 'post',
+			data
+		})
+	},
+	//新增与移除黑名单
+	async addOrRemoveBlacklist(data) {
+		return request({
+			url: 'api/user/addOrRemoveBlacklist',
+			method: 'post',
+			data
+		})
+	},
+	//我的团队
+	async myTeam(data) {
+		return request({
+			url: 'api/user/myTeam',
+			method: 'post',
+			data
+		})
+	},
 	//任务列表
 	async taskList(data) {
 		return request({
@@ -52,7 +149,7 @@ const api = {
 	mealsetList(data){
 		return request({
 			url: 'api/mealsetList',
-			method: 'get',
+			method: 'post',
 			data
 		})
 	},
diff --git a/api/qrcode.js b/api/qrcode.js
new file mode 100644
index 0000000..bb43597
--- /dev/null
+++ b/api/qrcode.js
@@ -0,0 +1,1622 @@
+//---------------------------------------------------------------------
+//
+// QR Code Generator for JavaScript
+//
+// Copyright (c) 2009 Kazuhiko Arase
+//
+// URL: [url=http://www.d-project.com/]http://www.d-project.com/[/url]
+//
+// Licensed under the MIT license:
+//        [url=http://www.opensource.org/licenses/mit-license.php]http://www.opensource.org/licenses/mit-license.php[/url]
+//
+// The word 'QR Code' is registered trademark of
+// DENSO WAVE INCORPORATED
+//        [url=http://www.denso-wave.com/qrcode/faqpatent-e.html]http://www.denso-wave.com/qrcode/faqpatent-e.html[/url]
+//
+//---------------------------------------------------------------------
+
+//---------------------------------------------------------------------
+// qrcode
+//代码第1588行为补充代码
+//修改人：chenxing
+//2017-02-27 16:21:32
+//---------------------------------------------------------------------
+
+/**
+ * qrcode
+ * @param typeNumber 1 to 40
+ * @param errorCorrectLevel 'L','M','Q','H'
+ */
+var qrcode = function (typeNumber, errorCorrectLevel) {
+
+  var PAD0 = 0xEC;
+  var PAD1 = 0x11;
+
+  var _typeNumber = typeNumber;
+  var _errorCorrectLevel = QRErrorCorrectLevel[errorCorrectLevel];
+  var _modules = null;
+  var _moduleCount = 0;
+  var _dataCache = null;
+  var _dataList = new Array();
+
+  var _this = {};
+
+  var makeImpl = function (test, maskPattern) {
+
+    _moduleCount = _typeNumber * 4 + 17;
+    _modules = function (moduleCount) {
+      var modules = new Array(moduleCount);
+      for (var row = 0; row < moduleCount; row += 1) {
+        modules[row] = new Array(moduleCount);
+        for (var col = 0; col < moduleCount; col += 1) {
+          modules[row][col] = null;
+        }
+      }
+      return modules;
+    }(_moduleCount);
+
+    setupPositionProbePattern(0, 0);
+    setupPositionProbePattern(_moduleCount - 7, 0);
+    setupPositionProbePattern(0, _moduleCount - 7);
+    setupPositionAdjustPattern();
+    setupTimingPattern();
+    setupTypeInfo(test, maskPattern);
+
+    if (_typeNumber >= 7) {
+      setupTypeNumber(test);
+    }
+
+    if (_dataCache == null) {
+      _dataCache = createData(_typeNumber, _errorCorrectLevel, _dataList);
+    }
+
+    mapData(_dataCache, maskPattern);
+  };
+
+  var setupPositionProbePattern = function (row, col) {
+
+    for (var r = -1; r <= 7; r += 1) {
+
+      if (row + r <= -1 || _moduleCount <= row + r) continue;
+
+      for (var c = -1; c <= 7; c += 1) {
+
+        if (col + c <= -1 || _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)) {
+          _modules[row + r][col + c] = true;
+        } else {
+          _modules[row + r][col + c] = false;
+        }
+      }
+    }
+  };
+
+  var getBestMaskPattern = function () {
+
+    var minLostPoint = 0;
+    var pattern = 0;
+
+    for (var i = 0; i < 8; i += 1) {
+
+      makeImpl(true, i);
+
+      var lostPoint = QRUtil.getLostPoint(_this);
+
+      if (i == 0 || minLostPoint > lostPoint) {
+        minLostPoint = lostPoint;
+        pattern = i;
+      }
+    }
+
+    return pattern;
+  };
+
+  var setupTimingPattern = function () {
+
+    for (var r = 8; r < _moduleCount - 8; r += 1) {
+      if (_modules[r][6] != null) {
+        continue;
+      }
+      _modules[r][6] = (r % 2 == 0);
+    }
+
+    for (var c = 8; c < _moduleCount - 8; c += 1) {
+      if (_modules[6][c] != null) {
+        continue;
+      }
+      _modules[6][c] = (c % 2 == 0);
+    }
+  };
+
+  var setupPositionAdjustPattern = function () {
+
+    var pos = QRUtil.getPatternPosition(_typeNumber);
+
+    for (var i = 0; i < pos.length; i += 1) {
+
+      for (var j = 0; j < pos.length; j += 1) {
+
+        var row = pos[i];
+        var col = pos[j];
+
+        if (_modules[row][col] != null) {
+          continue;
+        }
+
+        for (var r = -2; r <= 2; r += 1) {
+
+          for (var c = -2; c <= 2; c += 1) {
+
+            if (r == -2 || r == 2 || c == -2 || c == 2
+              || (r == 0 && c == 0)) {
+              _modules[row + r][col + c] = true;
+            } else {
+              _modules[row + r][col + c] = false;
+            }
+          }
+        }
+      }
+    }
+  };
+
+  var setupTypeNumber = function (test) {
+
+    var bits = QRUtil.getBCHTypeNumber(_typeNumber);
+
+    for (var i = 0; i < 18; i += 1) {
+      var mod = (!test && ((bits >> i) & 1) == 1);
+      _modules[Math.floor(i / 3)][i % 3 + _moduleCount - 8 - 3] = mod;
+    }
+
+    for (var i = 0; i < 18; i += 1) {
+      var mod = (!test && ((bits >> i) & 1) == 1);
+      _modules[i % 3 + _moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
+    }
+  };
+
+  var setupTypeInfo = function (test, maskPattern) {
+
+    var data = (_errorCorrectLevel << 3) | maskPattern;
+    var bits = QRUtil.getBCHTypeInfo(data);
+
+    // vertical
+    for (var i = 0; i < 15; i += 1) {
+
+      var mod = (!test && ((bits >> i) & 1) == 1);
+
+      if (i < 6) {
+        _modules[i][8] = mod;
+      } else if (i < 8) {
+        _modules[i + 1][8] = mod;
+      } else {
+        _modules[_moduleCount - 15 + i][8] = mod;
+      }
+    }
+
+    // horizontal
+    for (var i = 0; i < 15; i += 1) {
+
+      var mod = (!test && ((bits >> i) & 1) == 1);
+
+      if (i < 8) {
+        _modules[8][_moduleCount - i - 1] = mod;
+      } else if (i < 9) {
+        _modules[8][15 - i - 1 + 1] = mod;
+      } else {
+        _modules[8][15 - i - 1] = mod;
+      }
+    }
+
+    // fixed module
+    _modules[_moduleCount - 8][8] = (!test);
+  };
+
+  var mapData = function (data, maskPattern) {
+
+    var inc = -1;
+    var row = _moduleCount - 1;
+    var bitIndex = 7;
+    var byteIndex = 0;
+    var maskFunc = QRUtil.getMaskFunction(maskPattern);
+
+    for (var col = _moduleCount - 1; col > 0; col -= 2) {
+
+      if (col == 6) col -= 1;
+
+      while (true) {
+
+        for (var c = 0; c < 2; c += 1) {
+
+          if (_modules[row][col - c] == null) {
+
+            var dark = false;
+
+            if (byteIndex < data.length) {
+              dark = (((data[byteIndex] >>> bitIndex) & 1) == 1);
+            }
+
+            var mask = maskFunc(row, col - c);
+
+            if (mask) {
+              dark = !dark;
+            }
+
+            _modules[row][col - c] = dark;
+            bitIndex -= 1;
+
+            if (bitIndex == -1) {
+              byteIndex += 1;
+              bitIndex = 7;
+            }
+          }
+        }
+
+        row += inc;
+
+        if (row < 0 || _moduleCount <= row) {
+          row -= inc;
+          inc = -inc;
+          break;
+        }
+      }
+    }
+  };
+
+  var 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 += 1) {
+
+      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 += 1) {
+        dcdata[r][i] = 0xff & buffer.getBuffer()[i + offset];
+      }
+      offset += dcCount;
+
+      var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount);
+      var rawPoly = 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 += 1) {
+        var modIndex = i + modPoly.getLength() - ecdata[r].length;
+        ecdata[r][i] = (modIndex >= 0) ? modPoly.getAt(modIndex) : 0;
+      }
+    }
+
+    var totalCodeCount = 0;
+    for (var i = 0; i < rsBlocks.length; i += 1) {
+      totalCodeCount += rsBlocks[i].totalCount;
+    }
+
+    var data = new Array(totalCodeCount);
+    var index = 0;
+
+    for (var i = 0; i < maxDcCount; i += 1) {
+      for (var r = 0; r < rsBlocks.length; r += 1) {
+        if (i < dcdata[r].length) {
+          data[index] = dcdata[r][i];
+          index += 1;
+        }
+      }
+    }
+
+    for (var i = 0; i < maxEcCount; i += 1) {
+      for (var r = 0; r < rsBlocks.length; r += 1) {
+        if (i < ecdata[r].length) {
+          data[index] = ecdata[r][i];
+          index += 1;
+        }
+      }
+    }
+
+    return data;
+  };
+
+  var createData = function (typeNumber, errorCorrectLevel, dataList) {
+
+    var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel);
+
+    var buffer = qrBitBuffer();
+
+    for (var i = 0; i < dataList.length; i += 1) {
+      var data = dataList[i];
+      buffer.put(data.getMode(), 4);
+      buffer.put(data.getLength(), QRUtil.getLengthInBits(data.getMode(), typeNumber));
+      data.write(buffer);
+    }
+
+    // calc num max data.
+    var totalDataCount = 0;
+    for (var i = 0; i < rsBlocks.length; i += 1) {
+      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(PAD0, 8);
+
+      if (buffer.getLengthInBits() >= totalDataCount * 8) {
+        break;
+      }
+      buffer.put(PAD1, 8);
+    }
+
+    return createBytes(buffer, rsBlocks);
+  };
+
+  _this.addData = function (data) {
+    var newData = qr8BitByte(data);
+    _dataList.push(newData);
+    _dataCache = null;
+  };
+
+  _this.isDark = function (row, col) {
+    if (row < 0 || _moduleCount <= row || col < 0 || _moduleCount <= col) {
+      throw new Error(row + ',' + col);
+    }
+    return _modules[row][col];
+  };
+
+  _this.getModuleCount = function () {
+    return _moduleCount;
+  };
+
+  _this.make = function () {
+    makeImpl(false, getBestMaskPattern());
+  };
+
+  _this.createTableTag = function (cellSize, margin) {
+
+    cellSize = cellSize || 2;
+    margin = (typeof margin == 'undefined') ? cellSize * 4 : margin;
+
+    var qrHtml = '';
+
+    qrHtml += '<table style="';
+    qrHtml += ' border-width: 0px; border-style: none;';
+    qrHtml += ' border-collapse: collapse;';
+    qrHtml += ' padding: 0px; margin: ' + margin + 'px;';
+    qrHtml += '">';
+    qrHtml += '<tbody>';
+
+    for (var r = 0; r < _this.getModuleCount(); r += 1) {
+
+      qrHtml += '<tr>';
+
+      for (var c = 0; c < _this.getModuleCount(); c += 1) {
+        qrHtml += '<td style="';
+        qrHtml += ' border-width: 0px; border-style: none;';
+        qrHtml += ' border-collapse: collapse;';
+        qrHtml += ' padding: 0px; margin: 0px;';
+        qrHtml += ' width: ' + cellSize + 'px;';
+        qrHtml += ' height: ' + cellSize + 'px;';
+        qrHtml += ' background-color: ';
+        qrHtml += _this.isDark(r, c) ? '#000000' : '#ffffff';
+        qrHtml += ';';
+        qrHtml += '"/>';
+      }
+
+      qrHtml += '</tr>';
+    }
+
+    qrHtml += '</tbody>';
+    qrHtml += '</table>';
+
+    return qrHtml;
+  };
+
+  _this.createImgTag = function (cellSize, margin, size) {
+
+    cellSize = cellSize || 2;
+    margin = (typeof margin == 'undefined') ? cellSize * 4 : margin;
+
+    var min = margin;
+    var max = _this.getModuleCount() * cellSize + margin;
+
+    return createImgTag(size, size, function (x, y) {
+      if (min <= x && x < max && min <= y && y < max) {
+        var c = Math.floor((x - min) / cellSize);
+        var r = Math.floor((y - min) / cellSize);
+        return _this.isDark(r, c) ? 0 : 1;
+      } else {
+        return 1;
+      }
+    });
+  };
+
+  return _this;
+};
+
+//---------------------------------------------------------------------
+// qrcode.stringToBytes
+//---------------------------------------------------------------------
+
+qrcode.stringToBytes = function (s) {
+  var bytes = new Array();
+  for (var i = 0; i < s.length; i += 1) {
+    var c = s.charCodeAt(i);
+    bytes.push(c & 0xff);
+  }
+  return bytes;
+};
+
+//---------------------------------------------------------------------
+// qrcode.createStringToBytes
+//---------------------------------------------------------------------
+
+/**
+ * @param unicodeData base64 string of byte array.
+ * [16bit Unicode],[16bit Bytes], ...
+ * @param numChars
+ */
+qrcode.createStringToBytes = function (unicodeData, numChars) {
+
+  // create conversion map.
+
+  var unicodeMap = function () {
+
+    var bin = base64DecodeInputStream(unicodeData);
+    var read = function () {
+      var b = bin.read();
+      if (b == -1) throw new Error();
+      return b;
+    };
+
+    var count = 0;
+    var unicodeMap = {};
+    while (true) {
+      var b0 = bin.read();
+      if (b0 == -1) break;
+      var b1 = read();
+      var b2 = read();
+      var b3 = read();
+      var k = String.fromCharCode((b0 << 8) | b1);
+      var v = (b2 << 8) | b3;
+      unicodeMap[k] = v;
+      count += 1;
+    }
+    if (count != numChars) {
+      throw new Error(count + ' != ' + numChars);
+    }
+
+    return unicodeMap;
+  }();
+
+  var unknownChar = '?'.charCodeAt(0);
+
+  return function (s) {
+    var bytes = new Array();
+    for (var i = 0; i < s.length; i += 1) {
+      var c = s.charCodeAt(i);
+      if (c < 128) {
+        bytes.push(c);
+      } else {
+        var b = unicodeMap[s.charAt(i)];
+        if (typeof b == 'number') {
+          if ((b & 0xff) == b) {
+            // 1byte
+            bytes.push(b);
+          } else {
+            // 2bytes
+            bytes.push(b >>> 8);
+            bytes.push(b & 0xff);
+          }
+        } else {
+          bytes.push(unknownChar);
+        }
+      }
+    }
+    return bytes;
+  };
+};
+
+//---------------------------------------------------------------------
+// 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 = function () {
+
+  var 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]
+  ];
+  var G15 = (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0);
+  var G18 = (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0);
+  var G15_MASK = (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1);
+
+  var _this = {};
+
+  var getBCHDigit = function (data) {
+    var digit = 0;
+    while (data != 0) {
+      digit += 1;
+      data >>>= 1;
+    }
+    return digit;
+  };
+
+  _this.getBCHTypeInfo = function (data) {
+    var d = data << 10;
+    while (getBCHDigit(d) - getBCHDigit(G15) >= 0) {
+      d ^= (G15 << (getBCHDigit(d) - getBCHDigit(G15)));
+    }
+    return ((data << 10) | d) ^ G15_MASK;
+  };
+
+  _this.getBCHTypeNumber = function (data) {
+    var d = data << 12;
+    while (getBCHDigit(d) - getBCHDigit(G18) >= 0) {
+      d ^= (G18 << (getBCHDigit(d) - getBCHDigit(G18)));
+    }
+    return (data << 12) | d;
+  };
+
+  _this.getPatternPosition = function (typeNumber) {
+    return PATTERN_POSITION_TABLE[typeNumber - 1];
+  };
+
+  _this.getMaskFunction = function (maskPattern) {
+
+    switch (maskPattern) {
+
+      case QRMaskPattern.PATTERN000:
+        return function (i, j) { return (i + j) % 2 == 0; };
+      case QRMaskPattern.PATTERN001:
+        return function (i, j) { return i % 2 == 0; };
+      case QRMaskPattern.PATTERN010:
+        return function (i, j) { return j % 3 == 0; };
+      case QRMaskPattern.PATTERN011:
+        return function (i, j) { return (i + j) % 3 == 0; };
+      case QRMaskPattern.PATTERN100:
+        return function (i, j) { return (Math.floor(i / 2) + Math.floor(j / 3)) % 2 == 0; };
+      case QRMaskPattern.PATTERN101:
+        return function (i, j) { return (i * j) % 2 + (i * j) % 3 == 0; };
+      case QRMaskPattern.PATTERN110:
+        return function (i, j) { return ((i * j) % 2 + (i * j) % 3) % 2 == 0; };
+      case QRMaskPattern.PATTERN111:
+        return function (i, j) { return ((i * j) % 3 + (i + j) % 2) % 2 == 0; };
+
+      default:
+        throw new Error('bad maskPattern:' + maskPattern);
+    }
+  };
+
+  _this.getErrorCorrectPolynomial = function (errorCorrectLength) {
+    var a = qrPolynomial([1], 0);
+    for (var i = 0; i < errorCorrectLength; i += 1) {
+      a = a.multiply(qrPolynomial([1, QRMath.gexp(i)], 0));
+    }
+    return a;
+  };
+
+  _this.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);
+    }
+  };
+
+  _this.getLostPoint = function (qrcode) {
+
+    var moduleCount = qrcode.getModuleCount();
+
+    var lostPoint = 0;
+
+    // LEVEL1
+
+    for (var row = 0; row < moduleCount; row += 1) {
+      for (var col = 0; col < moduleCount; col += 1) {
+
+        var sameCount = 0;
+        var dark = qrcode.isDark(row, col);
+
+        for (var r = -1; r <= 1; r += 1) {
+
+          if (row + r < 0 || moduleCount <= row + r) {
+            continue;
+          }
+
+          for (var c = -1; c <= 1; c += 1) {
+
+            if (col + c < 0 || moduleCount <= col + c) {
+              continue;
+            }
+
+            if (r == 0 && c == 0) {
+              continue;
+            }
+
+            if (dark == qrcode.isDark(row + r, col + c)) {
+              sameCount += 1;
+            }
+          }
+        }
+
+        if (sameCount > 5) {
+          lostPoint += (3 + sameCount - 5);
+        }
+      }
+    };
+
+    // LEVEL2
+
+    for (var row = 0; row < moduleCount - 1; row += 1) {
+      for (var col = 0; col < moduleCount - 1; col += 1) {
+        var count = 0;
+        if (qrcode.isDark(row, col)) count += 1;
+        if (qrcode.isDark(row + 1, col)) count += 1;
+        if (qrcode.isDark(row, col + 1)) count += 1;
+        if (qrcode.isDark(row + 1, col + 1)) count += 1;
+        if (count == 0 || count == 4) {
+          lostPoint += 3;
+        }
+      }
+    }
+
+    // LEVEL3
+
+    for (var row = 0; row < moduleCount; row += 1) {
+      for (var col = 0; col < moduleCount - 6; col += 1) {
+        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 += 1) {
+      for (var row = 0; row < moduleCount - 6; row += 1) {
+        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 += 1) {
+      for (var row = 0; row < moduleCount; row += 1) {
+        if (qrcode.isDark(row, col)) {
+          darkCount += 1;
+        }
+      }
+    }
+
+    var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5;
+    lostPoint += ratio * 10;
+
+    return lostPoint;
+  };
+
+  return _this;
+}();
+
+//---------------------------------------------------------------------
+// QRMath
+//---------------------------------------------------------------------
+
+var QRMath = function () {
+
+  var EXP_TABLE = new Array(256);
+  var LOG_TABLE = new Array(256);
+
+  // initialize tables
+  for (var i = 0; i < 8; i += 1) {
+    EXP_TABLE[i] = 1 << i;
+  }
+  for (var i = 8; i < 256; i += 1) {
+    EXP_TABLE[i] = EXP_TABLE[i - 4]
+      ^ EXP_TABLE[i - 5]
+      ^ EXP_TABLE[i - 6]
+      ^ EXP_TABLE[i - 8];
+  }
+  for (var i = 0; i < 255; i += 1) {
+    LOG_TABLE[EXP_TABLE[i]] = i;
+  }
+
+  var _this = {};
+
+  _this.glog = function (n) {
+
+    if (n < 1) {
+      throw new Error('glog(' + n + ')');
+    }
+
+    return LOG_TABLE[n];
+  };
+
+  _this.gexp = function (n) {
+
+    while (n < 0) {
+      n += 255;
+    }
+
+    while (n >= 256) {
+      n -= 255;
+    }
+
+    return EXP_TABLE[n];
+  };
+
+  return _this;
+}();
+
+//---------------------------------------------------------------------
+// qrPolynomial
+//---------------------------------------------------------------------
+
+function qrPolynomial(num, shift) {
+
+  if (typeof num.length == 'undefined') {
+    throw new Error(num.length + '/' + shift);
+  }
+
+  var _num = function () {
+    var offset = 0;
+    while (offset < num.length && num[offset] == 0) {
+      offset += 1;
+    }
+    var _num = new Array(num.length - offset + shift);
+    for (var i = 0; i < num.length - offset; i += 1) {
+      _num[i] = num[i + offset];
+    }
+    return _num;
+  }();
+
+  var _this = {};
+
+  _this.getAt = function (index) {
+    return _num[index];
+  };
+
+  _this.getLength = function () {
+    return _num.length;
+  };
+
+  _this.multiply = function (e) {
+
+    var num = new Array(_this.getLength() + e.getLength() - 1);
+
+    for (var i = 0; i < _this.getLength(); i += 1) {
+      for (var j = 0; j < e.getLength(); j += 1) {
+        num[i + j] ^= QRMath.gexp(QRMath.glog(_this.getAt(i)) + QRMath.glog(e.getAt(j)));
+      }
+    }
+
+    return qrPolynomial(num, 0);
+  };
+
+  _this.mod = function (e) {
+
+    if (_this.getLength() - e.getLength() < 0) {
+      return _this;
+    }
+
+    var ratio = QRMath.glog(_this.getAt(0)) - QRMath.glog(e.getAt(0));
+
+    var num = new Array(_this.getLength());
+    for (var i = 0; i < _this.getLength(); i += 1) {
+      num[i] = _this.getAt(i);
+    }
+
+    for (var i = 0; i < e.getLength(); i += 1) {
+      num[i] ^= QRMath.gexp(QRMath.glog(e.getAt(i)) + ratio);
+    }
+
+    // recursive call
+    return qrPolynomial(num, 0).mod(e);
+  };
+
+  return _this;
+};
+
+//---------------------------------------------------------------------
+// QRRSBlock
+//---------------------------------------------------------------------
+
+var QRRSBlock = function () {
+
+
+  // [1: [L, M, Q, H], ..]
+  var RS_BLOCK_TABLE = [[1, 26, 19], [1, 26, 16], [1, 26, 13], [1, 26, 9], [1, 44, 34], [1, 44, 28], [1, 44, 22], [1, 44, 16], [1, 70, 55], [1, 70, 44], [2, 35, 17], [2, 35, 13], [1, 100, 80], [2, 50, 32], [2, 50, 24], [4, 25, 9], [1, 134, 108], [2, 67, 43], [2, 33, 15, 2, 34, 16], [2, 33, 11, 2, 34, 12], [2, 86, 68], [4, 43, 27], [4, 43, 19], [4, 43, 15], [2, 98, 78], [4, 49, 31], [2, 32, 14, 4, 33, 15], [4, 39, 13, 1, 40, 14], [2, 121, 97], [2, 60, 38, 2, 61, 39], [4, 40, 18, 2, 41, 19], [4, 40, 14, 2, 41, 15], [2, 146, 116], [3, 58, 36, 2, 59, 37], [4, 36, 16, 4, 37, 17], [4, 36, 12, 4, 37, 13], [2, 86, 68, 2, 87, 69], [4, 69, 43, 1, 70, 44], [6, 43, 19, 2, 44, 20], [6, 43, 15, 2, 44, 16], [4, 101, 81], [1, 80, 50, 4, 81, 51], [4, 50, 22, 4, 51, 23], [3, 36, 12, 8, 37, 13], [2, 116, 92, 2, 117, 93], [6, 58, 36, 2, 59, 37], [4, 46, 20, 6, 47, 21], [7, 42, 14, 4, 43, 15], [4, 133, 107], [8, 59, 37, 1, 60, 38], [8, 44, 20, 4, 45, 21], [12, 33, 11, 4, 34, 12], [3, 145, 115, 1, 146, 116], [4, 64, 40, 5, 65, 41], [11, 36, 16, 5, 37, 17], [11, 36, 12, 5, 37, 13], [5, 109, 87, 1, 110, 88], [5, 65, 41, 5, 66, 42], [5, 54, 24, 7, 55, 25], [11, 36, 12], [5, 122, 98, 1, 123, 99], [7, 73, 45, 3, 74, 46], [15, 43, 19, 2, 44, 20], [3, 45, 15, 13, 46, 16], [1, 135, 107, 5, 136, 108], [10, 74, 46, 1, 75, 47], [1, 50, 22, 15, 51, 23], [2, 42, 14, 17, 43, 15], [5, 150, 120, 1, 151, 121], [9, 69, 43, 4, 70, 44], [17, 50, 22, 1, 51, 23], [2, 42, 14, 19, 43, 15], [3, 141, 113, 4, 142, 114], [3, 70, 44, 11, 71, 45], [17, 47, 21, 4, 48, 22], [9, 39, 13, 16, 40, 14], [3, 135, 107, 5, 136, 108], [3, 67, 41, 13, 68, 42], [15, 54, 24, 5, 55, 25], [15, 43, 15, 10, 44, 16], [4, 144, 116, 4, 145, 117], [17, 68, 42], [17, 50, 22, 6, 51, 23], [19, 46, 16, 6, 47, 17], [2, 139, 111, 7, 140, 112], [17, 74, 46], [7, 54, 24, 16, 55, 25], [34, 37, 13], [4, 151, 121, 5, 152, 122], [4, 75, 47, 14, 76, 48], [11, 54, 24, 14, 55, 25], [16, 45, 15, 14, 46, 16], [6, 147, 117, 4, 148, 118], [6, 73, 45, 14, 74, 46], [11, 54, 24, 16, 55, 25], [30, 46, 16, 2, 47, 17], [8, 132, 106, 4, 133, 107], [8, 75, 47, 13, 76, 48], [7, 54, 24, 22, 55, 25], [22, 45, 15, 13, 46, 16], [10, 142, 114, 2, 143, 115], [19, 74, 46, 4, 75, 47], [28, 50, 22, 6, 51, 23], [33, 46, 16, 4, 47, 17], [8, 152, 122, 4, 153, 123], [22, 73, 45, 3, 74, 46], [8, 53, 23, 26, 54, 24], [12, 45, 15, 28, 46, 16], [3, 147, 117, 10, 148, 118], [3, 73, 45, 23, 74, 46], [4, 54, 24, 31, 55, 25], [11, 45, 15, 31, 46, 16], [7, 146, 116, 7, 147, 117], [21, 73, 45, 7, 74, 46], [1, 53, 23, 37, 54, 24], [19, 45, 15, 26, 46, 16], [5, 145, 115, 10, 146, 116], [19, 75, 47, 10, 76, 48], [15, 54, 24, 25, 55, 25], [23, 45, 15, 25, 46, 16], [13, 145, 115, 3, 146, 116], [2, 74, 46, 29, 75, 47], [42, 54, 24, 1, 55, 25], [23, 45, 15, 28, 46, 16], [17, 145, 115], [10, 74, 46, 23, 75, 47], [10, 54, 24, 35, 55, 25], [19, 45, 15, 35, 46, 16], [17, 145, 115, 1, 146, 116], [14, 74, 46, 21, 75, 47], [29, 54, 24, 19, 55, 25], [11, 45, 15, 46, 46, 16], [13, 145, 115, 6, 146, 116], [14, 74, 46, 23, 75, 47], [44, 54, 24, 7, 55, 25], [59, 46, 16, 1, 47, 17], [12, 151, 121, 7, 152, 122], [12, 75, 47, 26, 76, 48], [39, 54, 24, 14, 55, 25], [22, 45, 15, 41, 46, 16], [6, 151, 121, 14, 152, 122], [6, 75, 47, 34, 76, 48], [46, 54, 24, 10, 55, 25], [2, 45, 15, 64, 46, 16], [17, 152, 122, 4, 153, 123], [29, 74, 46, 14, 75, 47], [49, 54, 24, 10, 55, 25], [24, 45, 15, 46, 46, 16], [4, 152, 122, 18, 153, 123], [13, 74, 46, 32, 75, 47], [48, 54, 24, 14, 55, 25], [42, 45, 15, 32, 46, 16], [20, 147, 117, 4, 148, 118], [40, 75, 47, 7, 76, 48], [43, 54, 24, 22, 55, 25], [10, 45, 15, 67, 46, 16], [19, 148, 118, 6, 149, 119], [18, 75, 47, 31, 76, 48], [34, 54, 24, 34, 55, 25], [20, 45, 15, 61, 46, 16]];
+
+  var qrRSBlock = function (totalCount, dataCount) {
+    var _this = {};
+    _this.totalCount = totalCount;
+    _this.dataCount = dataCount;
+    return _this;
+  };
+
+  var _this = {};
+
+  var getRsBlockTable = function (typeNumber, errorCorrectLevel) {
+
+    switch (errorCorrectLevel) {
+      case QRErrorCorrectLevel.L:
+        return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
+      case QRErrorCorrectLevel.M:
+        return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
+      case QRErrorCorrectLevel.Q:
+        return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
+      case QRErrorCorrectLevel.H:
+        return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
+      default:
+        return undefined;
+    }
+  };
+
+  _this.getRSBlocks = function (typeNumber, errorCorrectLevel) {
+
+    var rsBlock = getRsBlockTable(typeNumber, errorCorrectLevel);
+
+    if (typeof rsBlock == 'undefined') {
+      throw new Error('bad rs block [url=home.php?mod=space&uid=5302]@[/url] typeNumber:' + typeNumber +
+        '/errorCorrectLevel:' + errorCorrectLevel);
+    }
+
+    var length = rsBlock.length / 3;
+
+    var list = new Array();
+
+    for (var i = 0; i < length; i += 1) {
+
+      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 += 1) {
+        list.push(qrRSBlock(totalCount, dataCount));
+      }
+    }
+
+    return list;
+  };
+
+  return _this;
+}();
+
+//---------------------------------------------------------------------
+// qrBitBuffer
+//---------------------------------------------------------------------
+
+var qrBitBuffer = function () {
+
+  var _buffer = new Array();
+  var _length = 0;
+
+  var _this = {};
+
+  _this.getBuffer = function () {
+    return _buffer;
+  };
+
+  _this.getAt = function (index) {
+    var bufIndex = Math.floor(index / 8);
+    return ((_buffer[bufIndex] >>> (7 - index % 8)) & 1) == 1;
+  };
+
+  _this.put = function (num, length) {
+    for (var i = 0; i < length; i += 1) {
+      _this.putBit(((num >>> (length - i - 1)) & 1) == 1);
+    }
+  };
+
+  _this.getLengthInBits = function () {
+    return _length;
+  };
+
+  _this.putBit = function (bit) {
+
+    var bufIndex = Math.floor(_length / 8);
+    if (_buffer.length <= bufIndex) {
+      _buffer.push(0);
+    }
+
+    if (bit) {
+      _buffer[bufIndex] |= (0x80 >>> (_length % 8));
+    }
+
+    _length += 1;
+  };
+
+  return _this;
+};
+
+//---------------------------------------------------------------------
+// qr8BitByte
+//---------------------------------------------------------------------
+
+var qr8BitByte = function (data) {
+
+  var _mode = QRMode.MODE_8BIT_BYTE;
+  var _data = data;
+  var _parsedData = [];
+
+  var _this = {};
+
+
+  // Added to support UTF-8 Characters
+  for (var i = 0, l = _data.length; i < l; i++) {
+    var byteArray = [];
+    var code = _data.charCodeAt(i);
+
+    if (code > 0x10000) {
+      byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
+      byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
+      byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
+      byteArray[3] = 0x80 | (code & 0x3F);
+    } else if (code > 0x800) {
+      byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
+      byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
+      byteArray[2] = 0x80 | (code & 0x3F);
+    } else if (code > 0x80) {
+      byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
+      byteArray[1] = 0x80 | (code & 0x3F);
+    } else {
+      byteArray[0] = code;
+    }
+
+    // Fix Unicode corruption bug
+    _parsedData.push(byteArray);
+  }
+
+  _parsedData = Array.prototype.concat.apply([], _parsedData);
+
+  if (_parsedData.length != _data.length) {
+    _parsedData.unshift(191);
+    _parsedData.unshift(187);
+    _parsedData.unshift(239);
+  }
+
+  var _bytes = _parsedData;
+
+  _this.getMode = function () {
+    return _mode;
+  };
+
+  _this.getLength = function (buffer) {
+    return _bytes.length;
+  };
+
+  _this.write = function (buffer) {
+    for (var i = 0; i < _bytes.length; i += 1) {
+      buffer.put(_bytes[i], 8);
+    }
+  };
+
+  return _this;
+};
+
+//=====================================================================
+// GIF Support etc.
+//
+
+//---------------------------------------------------------------------
+// byteArrayOutputStream
+//---------------------------------------------------------------------
+
+var byteArrayOutputStream = function () {
+
+  var _bytes = new Array();
+
+  var _this = {};
+
+  _this.writeByte = function (b) {
+    _bytes.push(b & 0xff);
+  };
+
+  _this.writeShort = function (i) {
+    _this.writeByte(i);
+    _this.writeByte(i >>> 8);
+  };
+
+  _this.writeBytes = function (b, off, len) {
+    off = off || 0;
+    len = len || b.length;
+    for (var i = 0; i < len; i += 1) {
+      _this.writeByte(b[i + off]);
+    }
+  };
+
+  _this.writeString = function (s) {
+    for (var i = 0; i < s.length; i += 1) {
+      _this.writeByte(s.charCodeAt(i));
+    }
+  };
+
+  _this.toByteArray = function () {
+    return _bytes;
+  };
+
+  _this.toString = function () {
+    var s = '';
+    s += '[';
+    for (var i = 0; i < _bytes.length; i += 1) {
+      if (i > 0) {
+        s += ',';
+      }
+      s += _bytes[i];
+    }
+    s += ']';
+    return s;
+  };
+
+  return _this;
+};
+
+//---------------------------------------------------------------------
+// base64EncodeOutputStream
+//---------------------------------------------------------------------
+
+var base64EncodeOutputStream = function () {
+
+  var _buffer = 0;
+  var _buflen = 0;
+  var _length = 0;
+  var _base64 = '';
+
+  var _this = {};
+
+  var writeEncoded = function (b) {
+    _base64 += String.fromCharCode(encode(b & 0x3f));
+  };
+
+  var encode = function (n) {
+    if (n < 0) {
+      // error.
+    } else if (n < 26) {
+      return 0x41 + n;
+    } else if (n < 52) {
+      return 0x61 + (n - 26);
+    } else if (n < 62) {
+      return 0x30 + (n - 52);
+    } else if (n == 62) {
+      return 0x2b;
+    } else if (n == 63) {
+      return 0x2f;
+    }
+    throw new Error('n:' + n);
+  };
+
+  _this.writeByte = function (n) {
+
+    _buffer = (_buffer << 8) | (n & 0xff);
+    _buflen += 8;
+    _length += 1;
+
+    while (_buflen >= 6) {
+      writeEncoded(_buffer >>> (_buflen - 6));
+      _buflen -= 6;
+    }
+  };
+
+  _this.flush = function () {
+
+    if (_buflen > 0) {
+      writeEncoded(_buffer << (6 - _buflen));
+      _buffer = 0;
+      _buflen = 0;
+    }
+
+    if (_length % 3 != 0) {
+      // padding
+      var padlen = 3 - _length % 3;
+      for (var i = 0; i < padlen; i += 1) {
+        _base64 += '=';
+      }
+    }
+  };
+
+  _this.toString = function () {
+    return _base64;
+  };
+
+  return _this;
+};
+
+//---------------------------------------------------------------------
+// base64DecodeInputStream
+//---------------------------------------------------------------------
+
+var base64DecodeInputStream = function (str) {
+
+  var _str = str;
+  var _pos = 0;
+  var _buffer = 0;
+  var _buflen = 0;
+
+  var _this = {};
+
+  _this.read = function () {
+
+    while (_buflen < 8) {
+
+      if (_pos >= _str.length) {
+        if (_buflen == 0) {
+          return -1;
+        }
+        throw new Error('unexpected end of file./' + _buflen);
+      }
+
+      var c = _str.charAt(_pos);
+      _pos += 1;
+
+      if (c == '=') {
+        _buflen = 0;
+        return -1;
+      } else if (c.match(/^\s$/)) {
+        // ignore if whitespace.
+        continue;
+      }
+
+      _buffer = (_buffer << 6) | decode(c.charCodeAt(0));
+      _buflen += 6;
+    }
+
+    var n = (_buffer >>> (_buflen - 8)) & 0xff;
+    _buflen -= 8;
+    return n;
+  };
+
+  var decode = function (c) {
+    if (0x41 <= c && c <= 0x5a) {
+      return c - 0x41;
+    } else if (0x61 <= c && c <= 0x7a) {
+      return c - 0x61 + 26;
+    } else if (0x30 <= c && c <= 0x39) {
+      return c - 0x30 + 52;
+    } else if (c == 0x2b) {
+      return 62;
+    } else if (c == 0x2f) {
+      return 63;
+    } else {
+      throw new Error('c:' + c);
+    }
+  };
+
+  return _this;
+};
+
+//---------------------------------------------------------------------
+// gifImage (B/W)
+//---------------------------------------------------------------------
+
+var gifImage = function (width, height) {
+
+  var _width = width;
+  var _height = height;
+  var _data = new Array(width * height);
+
+  var _this = {};
+
+  _this.setPixel = function (x, y, pixel) {
+    _data[y * _width + x] = pixel;
+  };
+
+  _this.write = function (out) {
+
+    //---------------------------------
+    // GIF Signature
+
+    out.writeString('GIF87a');
+
+    //---------------------------------
+    // Screen Descriptor
+
+    out.writeShort(_width);
+    out.writeShort(_height);
+
+    out.writeByte(0x80); // 2bit
+    out.writeByte(0);
+    out.writeByte(0);
+
+    //---------------------------------
+    // Global Color Map
+
+    // black
+    out.writeByte(0x00);
+    out.writeByte(0x00);
+    out.writeByte(0x00);
+
+    // white
+    out.writeByte(0xff);
+    out.writeByte(0xff);
+    out.writeByte(0xff);
+
+    //---------------------------------
+    // Image Descriptor
+
+    out.writeString(',');
+    out.writeShort(0);
+    out.writeShort(0);
+    out.writeShort(_width);
+    out.writeShort(_height);
+    out.writeByte(0);
+
+    //---------------------------------
+    // Local Color Map
+
+    //---------------------------------
+    // Raster Data
+
+    var lzwMinCodeSize = 2;
+    var raster = getLZWRaster(lzwMinCodeSize);
+
+    out.writeByte(lzwMinCodeSize);
+
+    var offset = 0;
+
+    while (raster.length - offset > 255) {
+      out.writeByte(255);
+      out.writeBytes(raster, offset, 255);
+      offset += 255;
+    }
+
+    out.writeByte(raster.length - offset);
+    out.writeBytes(raster, offset, raster.length - offset);
+    out.writeByte(0x00);
+
+    //---------------------------------
+    // GIF Terminator
+    out.writeString(';');
+  };
+
+  var bitOutputStream = function (out) {
+
+    var _out = out;
+    var _bitLength = 0;
+    var _bitBuffer = 0;
+
+    var _this = {};
+
+    _this.write = function (data, length) {
+
+      if ((data >>> length) != 0) {
+        throw new Error('length over');
+      }
+
+      while (_bitLength + length >= 8) {
+        _out.writeByte(0xff & ((data << _bitLength) | _bitBuffer));
+        length -= (8 - _bitLength);
+        data >>>= (8 - _bitLength);
+        _bitBuffer = 0;
+        _bitLength = 0;
+      }
+
+      _bitBuffer = (data << _bitLength) | _bitBuffer;
+      _bitLength = _bitLength + length;
+    };
+
+    _this.flush = function () {
+      if (_bitLength > 0) {
+        _out.writeByte(_bitBuffer);
+      }
+    };
+
+    return _this;
+  };
+
+  var getLZWRaster = function (lzwMinCodeSize) {
+
+    var clearCode = 1 << lzwMinCodeSize;
+    var endCode = (1 << lzwMinCodeSize) + 1;
+    var bitLength = lzwMinCodeSize + 1;
+
+    // Setup LZWTable
+    var table = lzwTable();
+
+    for (var i = 0; i < clearCode; i += 1) {
+      table.add(String.fromCharCode(i));
+    }
+    table.add(String.fromCharCode(clearCode));
+    table.add(String.fromCharCode(endCode));
+
+    var byteOut = byteArrayOutputStream();
+    var bitOut = bitOutputStream(byteOut);
+
+    // clear code
+    bitOut.write(clearCode, bitLength);
+
+    var dataIndex = 0;
+
+    var s = String.fromCharCode(_data[dataIndex]);
+    dataIndex += 1;
+
+    while (dataIndex < _data.length) {
+
+      var c = String.fromCharCode(_data[dataIndex]);
+      dataIndex += 1;
+
+      if (table.contains(s + c)) {
+
+        s = s + c;
+
+      } else {
+
+        bitOut.write(table.indexOf(s), bitLength);
+
+        if (table.size() < 0xfff) {
+
+          if (table.size() == (1 << bitLength)) {
+            bitLength += 1;
+          }
+
+          table.add(s + c);
+        }
+
+        s = c;
+      }
+    }
+
+    bitOut.write(table.indexOf(s), bitLength);
+
+    // end code
+    bitOut.write(endCode, bitLength);
+
+    bitOut.flush();
+
+    return byteOut.toByteArray();
+  };
+
+  var lzwTable = function () {
+
+    var _map = {};
+    var _size = 0;
+
+    var _this = {};
+
+    _this.add = function (key) {
+      if (_this.contains(key)) {
+        throw new Error('dup key:' + key);
+      }
+      _map[key] = _size;
+      _size += 1;
+    };
+
+    _this.size = function () {
+      return _size;
+    };
+
+    _this.indexOf = function (key) {
+      return _map[key];
+    };
+
+    _this.contains = function (key) {
+      return typeof _map[key] != 'undefined';
+    };
+
+    return _this;
+  };
+
+  return _this;
+};
+
+var createImgTag = function (width, height, getPixel, alt) {
+
+  var gif = gifImage(width, height);
+  for (var y = 0; y < height; y += 1) {
+    for (var x = 0; x < width; x += 1) {
+      gif.setPixel(x, y, getPixel(x, y));
+    }
+  }
+  var b = byteArrayOutputStream();
+  gif.write(b);
+
+  var base64 = base64EncodeOutputStream();
+  var bytes = b.toByteArray();
+  for (var i = 0; i < bytes.length; i += 1) {
+    base64.writeByte(bytes[i]);
+  }
+  base64.flush();
+
+  var img = '';
+  img += 'data:image/gif;base64,';
+  img += base64;
+
+  return img;
+};
+
+//---------------------------------------------------------------------
+// returns qrcode function.
+
+var createQrCodeImg = function (text, options) {
+  options = options || {};
+  var typeNumber = options.typeNumber || 7;
+  var errorCorrectLevel = options.errorCorrectLevel || 'M';
+  var size = options.size || 500;
+
+  var qr;
+
+  try {
+    qr = qrcode(typeNumber, errorCorrectLevel || 'M');
+    qr.addData(text);
+    qr.make();
+  } catch (e) {
+    if (typeNumber >= 40) {
+      throw new Error('Text too long to encode');
+    } else {
+      return gen(text, {
+        size: size,
+        errorCorrectLevel: errorCorrectLevel,
+        typeNumber: typeNumber + 1
+      });
+    }
+  }
+
+  // calc cellsize and margin
+  var cellsize = parseInt(size / qr.getModuleCount());
+  var margin = parseInt((size - qr.getModuleCount() * cellsize) / 2);
+  return qr.createImgTag(cellsize, margin, size);
+
+
+};
+module.exports = {
+  createQrCodeImg
+};
\ No newline at end of file
diff --git a/components/dashan.vue b/components/dashan.vue
index 26503f9..fdc6fbf 100644
--- a/components/dashan.vue
+++ b/components/dashan.vue
@@ -13,7 +13,7 @@
 					<view class="b">
 						<view class="txt">系统推荐：</view>
 						<view class="list" v-if="list && list.length>0">
-							<view class="item" v-for="(a,i) in list" :class="tabIndex == i?'item-on':''" >
+							<view class="item" v-for="(a,i) in list" :key="i" :class="tabIndex == i?'item-on':''" >
 								<view class="text" @click="tabItem(1,i)">{{a.content}}</view>
 								<view class="anniu anniu-on" v-if="a.isDefault == 1">默认</view>
 								<view class="anniu" v-else @click="tabItem(2,i)">设为默认</view>
@@ -115,7 +115,7 @@
 				const { code, data } = await this.$api.chat({
 					userId: uni.getStorageSync("userInfo").id,
 					sellerId: this.info.userid,
-					type: 3,
+					type: 6,
 					message: this.content
 				}) 
 				if(code == 200){
@@ -162,12 +162,14 @@
 <style scoped lang="scss">
 .dashan{
 	width: 670rpx;
-	min-height: 270rpx;
+	min-height: 270rpx;
+	overflow: hidden;
 	background: #FFFFFF;
 	border-radius: 20rpx;
+	padding-bottom: 50rpx;
 	.fd{
-		margin-top: 50rpx;
-		margin-bottom: 50rpx;
+		margin-top: 50rpx;
+		overflow: hidden;
 		.btn{
 			width: 300rpx;
 			text-align: center;
@@ -219,7 +221,10 @@
 				}
 			}
 		}
-		.list{
+		.list{
+			max-height: 500rpx;
+			overflow-x: hidden;
+			overflow-y: auto;
 			.item{
 				margin-top: 20rpx;
 				display: flex;
diff --git a/components/share.vue b/components/share.vue
index 5196bad..5894334 100644
--- a/components/share.vue
+++ b/components/share.vue
@@ -89,9 +89,10 @@
 						}
 					})
 					return ;
-				}else if(scene == 'src'){
+				}
+				if(scene == 'src'){
 					uni.setClipboardData({
-						data: this.$articleShareUrl+this.info.id,
+						data: this.$userShareUrl+this.info.invitationCode,
 						success: function () {
 							uni.getClipboardData({
 								success: function (res) {
@@ -104,7 +105,13 @@
 						}
 					})
 					return ;
-				}
+				}
+				if(scene == 'hb'){
+					uni.$emit("closeSharePopup",false)
+					uni.$emit("openHaibaoPopup",true)
+					return;
+				}
+				
 				uni.showLoading({
 					title: '加载中',
 					mask: true
diff --git a/main.js b/main.js
index 5f9853c..d248d30 100644
--- a/main.js
+++ b/main.js
@@ -20,7 +20,7 @@ Vue.config.productionTip = false
 import api from '@/api/index.js'
 Vue.prototype.$api = api
 Vue.prototype.$articleShareUrl = "https://api.lyiyuan.cn/profile/upload/web/index.html#/pages/dongtai/detail?type=web&id="
-Vue.prototype.$userShareUrl = "https://api.lyiyuan.cn/profile/upload/web/index.html#/pages/login/res?id="
+Vue.prototype.$userShareUrl = "https://api.lyiyuan.cn/profile/upload/web/index.html#/pages/login/reg?id="
 
 App.mpType = 'app'
 const app = new Vue({
diff --git a/pages.json b/pages.json
index 6e48b07..a038257 100644
--- a/pages.json
+++ b/pages.json
@@ -352,7 +352,7 @@
         	"path" : "pages/users/xieyi/index",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "协议规则"
+        		"navigationBarTitleText" : ""
         	}
         },
         {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 72dca5a..5838f2e 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -21,7 +21,7 @@
 				<image src="@/static/wx.png" @click="wxLogin()"></image>
 			</view>
 			<view class="c">
-				<image @click="clickCheck()" v-if="isCheck" src="@/static/icon-select.png"></image><image @click="clickCheck()" v-else src="@/static/icon-select-on.png"></image>我已阅读并同意<text>《APP用户协议》</text><text>《APP隐私条款》</text>
+				<image @click="clickCheck()" v-if="isCheck" src="@/static/icon-select.png"></image><image @click="clickCheck()" v-else src="@/static/icon-select-on.png"></image>我已阅读并同意<text @click="openPages(1)">《APP用户协议》</text><text@click="openPages(2)">《APP隐私条款》</text>
 			</view>
 		</view>
 	</view>
@@ -55,7 +55,18 @@
 				this.isShow1 = true
 			}
 		},
-		methods: {
+		methods: {
+			openPages(index) {
+				if(index == 1){
+					uni.navigateTo({
+						url: "/pages/users/about/index?type=CONFIG_USER_AGREEMENT"
+					})
+				}else{
+					uni.navigateTo({
+						url: "/pages/users/about/index?type=CONFIG_PRIVACY_POLICY"
+					})
+				}
+			},
 			// App微信登录
 			wxLogin() {
 				const that = this;
diff --git a/pages/login/password.vue b/pages/login/password.vue
index 7226881..ab80ba3 100644
--- a/pages/login/password.vue
+++ b/pages/login/password.vue
@@ -159,7 +159,8 @@
 					this.phone = ""
 					this.code = ""
 					this.apassword = ""
-					this.password = ""
+					this.password = ""
+					uni.removeStorageSync("userInfo")
 					uni.showToast({
 						title: "修改成功"
 					})
diff --git a/pages/peiwan/detail.vue b/pages/peiwan/detail.vue
index 3422eb4..280919b 100644
--- a/pages/peiwan/detail.vue
+++ b/pages/peiwan/detail.vue
@@ -13,7 +13,7 @@
 				<view class="vip" v-if="userInfo.memberflag>=1">VIP{{userInfo.memberflag}}</view>
 				<image class="sex" v-if="userInfo.sex ==2" src="@/static/peiwan-nv.png"></image>
 				<image class="sex" v-else src="@/static/peiwan-nan.png"></image>
-				<view class="city" v-if="userInfo.province"><image class="location" src="@/static/dingwei2.png"></image>{{userInfo.province+"-"+userInfo.city}}</view>
+				<view class="city" v-if="userInfo.province && userInfo.cityHide != 1"><image class="location" src="@/static/dingwei2.png"></image>{{userInfo.province+"-"+userInfo.city}}</view>
 			</view>
 			<view class="b">
 				<view class="tag" v-if="userInfo.age">{{userInfo.age}}岁</view>
diff --git a/pages/peiwan/index.vue b/pages/peiwan/index.vue
index f4519b6..5b9a50d 100644
--- a/pages/peiwan/index.vue
+++ b/pages/peiwan/index.vue
@@ -291,7 +291,20 @@
 </script>
 
 <style scoped lang="scss">
-.home{
+.home{
+	.empty{
+		padding: 150rpx 0;
+		text-align: center;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #222222;
+		image{
+			display: block;
+			width: 460rpx;
+			height: 400rpx;
+			margin: 0 auto;
+		}
+	}
 	&-navbar{
 		width: 100%;
 		overflow: hidden;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 005d4e6..18b39d3 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -154,17 +154,17 @@
 		<view class="invite" v-if="show">
 			<view class="body">
 				<view class="content">
-					<image class="avatar" :src="userInfo.img"></image>
-					<view class="name">{{userInfo.id}}</view>
+					<image class="avatar" :src="userInfo.faceImage?userInfo.faceImage:userInfo.img"></image>
+					<view class="name">{{userInfo.nickname}}</view>
 					<image class="txt" src="@/static/txt.png"></image>
-					<image class="code" src="@/static/code.png"></image>
+					<image class="code" :src="qrcode" show-menu-by-longpress="true"></image>
 					<view class="txt1">-长按识别图中二维码-</view>
 					<view class="id">邀请码：{{userInfo.invitationCode}}</view>
 					<image class="zw" src="@/static/zw.png"></image>
 				</view>
 				<view class="btns">
-					<view class="cancle">取消</view>
-					<view class="sure">保存</view>
+					<view class="cancle" @click="toCancle()">取消</view>
+					<view class="sure" @click="toSave()">保存</view>
 				</view>
 			</view>
 		</view>
@@ -173,7 +173,8 @@
 	</view>
 </template>
 
-<script>
+<script>
+	import { createQrCodeImg } from '@/api/qrcode'
 	export default {
 		data() {
 			return {
@@ -189,7 +190,8 @@
 				},
 				userInfo: {},
 				baseUrl: "",
-				info: {}
+				info: {},
+				qrcode: ""
 			}
 		},
 		onLoad() {
@@ -198,12 +200,66 @@
 				that.isPopup = false;
 				that.isShare = false;
 				that.baseUrl = that.$baseUrl;
+			})
+			uni.$on("openHaibaoPopup",res=>{
+				that.show = true;
 			})
 		},
 		onShow() {
 			this.getUserInfo();
 		},
-		methods: {
+		methods: {
+			toCancle() {
+				this.show = false;
+			},
+			toSave() {
+				uni.showLoading({
+					title: "正在保存"
+				})
+				uni.downloadFile({
+					url:"https://shejiao.njlvguo.com/uploads/erweima.jpg",
+					complete:(res)=>{
+						uni.hideLoading();
+						uni.saveImageToPhotosAlbum({
+							filePath:res.tempFilePath,
+							success: function() {  
+								uni.showToast({  
+									title: "保存成功",  
+									icon: "none"  
+								});  
+							},  
+							fail: function() {  
+								uni.showToast({  
+									title: "保存失败",  
+									icon: "none"  
+								});  
+							}  
+						})
+					}
+				})
+				this.show = false;
+			},
+			//字典查询
+			async getConfigData() {
+				const that = this;
+				let res1 = await that.$api.getConfigData({dictType: 'CONFIG_CUSTOMER_SERVICE_USERID'});
+				if(res1.data.content){
+					that.toChat(res1.data.content)
+				}
+			},
+			//去聊天
+			async toChat(sellerId) {
+				const { code, data } = await this.$api.findZegoToken({
+					userId: uni.getStorageSync("userInfo").id,
+					sellerId
+				})
+				if(code == 200){
+					uni.setStorageSync("chatToken",data.token);
+					uni.navigateTo({
+						url: "/pages/users/chat?id="+sellerId+"&roomId="+data.roomId
+					})
+				}
+			},
 			openPage(index,id){
 				if(index == 1){
 					uni.navigateTo({
@@ -243,7 +299,12 @@
 					uni.navigateTo({
 						url: "/pages/users/wallet/index"
 					})
-				}else if(index == 10){
+				}else if(index == 10){
+					if(this.userInfo.realnameFlag == 0){
+						this.isPopup = true
+						return ;
+					}
+					
 					uni.navigateTo({
 						url: "/pages/users/recharge/index"
 					})
@@ -287,9 +348,46 @@
 					if(this.userInfo.realnameFlag == 0){
 						this.isPopup = true
 						return ;
-					}
+					}
+					this.info.id = this.userInfo.id
+					this.info.invitationCode = this.userInfo.invitationCode
 					this.isShare = true;
-				}
+				}else if(index == 18){
+					uni.navigateTo({
+						url: "/pages/users/team/index"
+					})
+				}else if(index == 19){
+					uni.navigateTo({
+						url: "/pages/users/site/index"
+					})
+				}else if(index == 20){
+					uni.navigateTo({
+						url: "/pages/users/help/index"
+					})
+				}else if(index == 21){
+					if(this.userInfo.realnameFlag == 0){
+						this.isPopup = true
+						return ;
+					}
+					uni.navigateTo({
+						url: "/pages/users/chengshi/index"
+					})
+				}else if(index == 22){
+					if(this.userInfo.realnameFlag == 0){
+						this.isPopup = true
+						return ;
+					}
+					uni.navigateTo({
+						url: "/pages/users/feedback/add"
+					})
+				}else if(index == 23){
+					if(this.userInfo.realnameFlag == 0){
+						this.isPopup = true
+						return ;
+					}
+					this.getConfigData();
+				}
+				
 			},
 			//签到
 			async toSign() {
@@ -313,7 +411,8 @@
 			async getUserInfo() {
 				const { code, data , msg } = await this.$api.findUserInfo({userId: uni.getStorageSync("userInfo").id});
 				if(code == 200){
-					this.userInfo = data;
+					this.userInfo = data;
+					this.qrcode = createQrCodeImg(this.$userShareUrl+this.userInfo.invitationCode, { 'size': 500 });
 					uni.setStorageSync("userInfo",data);
 				}else{
 					uni.showToast({
diff --git a/pages/users/about/index.vue b/pages/users/about/index.vue
index 3ea1280..1316674 100644
--- a/pages/users/about/index.vue
+++ b/pages/users/about/index.vue
@@ -20,7 +20,9 @@
 			async getInfo() {
 				const { code,data } = await this.$api.getConfigData({dictType: this.type});
 				if(code == 200){
-					this.content = data.content;
+					this.content = data.content.replace(/style=""/g, '')
+								.replace(/<img " src=/g, '<img src=')
+								.replace(/<img src=/g, '<img style="width: 100%; height:100%; display:block" src=');
 					uni.setNavigationBarTitle({
 						title: data.title
 					})
diff --git a/pages/users/chengshi/index.vue b/pages/users/chengshi/index.vue
index 41526b5..d8e4879 100644
--- a/pages/users/chengshi/index.vue
+++ b/pages/users/chengshi/index.vue
@@ -1,10 +1,8 @@
 <template>
 	<view class="qingshaonian">
-		<view class="bd">
-			
-		</view>
+		<view class="bd" v-html="content"></view>
 		<view class="fd">
-			<view class="btn">申请合作</view>
+			<view class="btn" @click="show = true">申请合作</view>
 		</view>
 		<u-popup v-model="show" mode="center" border-radius="20" :mask-close-able="true" zIndex="21">
 			<view class="hezuo">
@@ -13,45 +11,110 @@
 					<view class="item">
 						<view class="a"><text>*</text>姓名</view>
 						<view class="b">
-							<input type="text" placeholder="请输入" />
+							<input v-model="name" type="text" placeholder="请输入" />
 						</view>
 					</view>
 					<view class="item">
 						<view class="a"><text>*</text>手机号</view>
 						<view class="b">
-							<input type="number" placeholder="请输入" />
+							<input v-model="phone" type="number" placeholder="请输入" />
 						</view>
 					</view>
 					<view class="item">
 						<view class="a">所在区域</view>
 						<view class="b">
-							<picker mode="region">
-								<view class="picker picker-on">请输入</view>
-							</picker>
+							<view class="picker picker-on" @click="show1 = true">{{province?(province+"-"+city+"-"+district):'请选择'}}</view>
 						</view>
 					</view>
 					<view class="item">
 						<view class="a">公司名称</view>
 						<view class="b">
-							<input type="text" placeholder="请输入" />
+							<input v-model="companyname" type="text" placeholder="请输入" />
 						</view>
 					</view>
 				</view>
-				<view class="btns">提交</view>
+				<view class="btns" @click="toReg()">提交</view>
 			</view>
-		</u-popup>
+		</u-popup>
+		<u-picker mode="region" v-model="show1" :defaultRegion="defaultRegion" @cancel="cancel" @confirm="confirm" ></u-picker>
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {
-				show: true
+			return {
+				show1: false,
+				content: "",
+				show: false,
+				defaultRegion: [],
+				phone: "",
+				name: "",
+				companyname: "",
+				province: "",
+				city: "",
+				district: ""
 			}
+		},
+		onLoad() {
+			this.getInfo();
 		},
-		methods: {
-			
+		methods: {
+			cancel() {
+				this.show1 = false;
+			},
+			confirm(e) {
+				this.show1 = false;
+				this.defaultRegion = [e.province.name,e.city.name,e.area.name]
+				this.province = e.province.name;
+				this.city = e.city.name;
+				this.district = e.area.name;
+			},
+			async toReg() {
+				if(!this.name){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "姓名不能为空！"
+					})
+					return ;
+				}
+				if(!this.phone){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "手机号不能为空！"
+					})
+					return ;
+				}
+				const {code, data, msg} = await this.$api.urbanCooperation({
+					userId: uni.getStorageSync("userInfo").id,
+					name: this.name,
+					phone: this.phone,
+					quyu: this.defaultRegion.join(","),
+					companyname: this.companyname,
+				})
+				if(code == 200){
+					uni.showToast({
+						title: "提交成功"
+					})
+					this.show  = false
+				}else{
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: msg
+					})
+				}
+			},
+			async getInfo() {
+				const { code,data } = await this.$api.getConfigData({dictType: 'CONFIG_URBAN_COOPERATION'});
+				if(code == 200){
+					this.content = data.content.replace(/style=""/g, '')
+								.replace(/<img " src=/g, '<img src=')
+								.replace(/<img src=/g, '<img style="width: 100%; height:100%; display:block" src=');
+				}
+			},
 		}
 	}
 </script>
diff --git a/pages/users/dashan/index.vue b/pages/users/dashan/index.vue
index b901432..e98caaf 100644
--- a/pages/users/dashan/index.vue
+++ b/pages/users/dashan/index.vue
@@ -2,9 +2,10 @@
 	<view class="qingshaonian">
 		<view class="title">设置搭讪语后，无需选择，直接发送</view>
 		<view class="bd">
-			<view class="item" v-for="i in 10" :key="i" @click="tabItem(i)">
-				<view class="txt">哈喽！很高兴认识你，一起嗨皮吧~</view>
-				<view class="btn" :class="tabIndex == i?'btn-on':''">{{tabIndex == i?'默认':'设为默认'}}</view>
+			<view class="item"v-for="(a,i) in list" :key="i">
+				<view class="txt">{{a.content}}</view>
+				<view class="btn btn-on" v-if="a.isDefault == 1">默认</view>
+				<view class="btn" v-else @click="toSet(i)">设为默认</view>
 			</view>
 		</view>
 	</view>
@@ -14,13 +15,36 @@
 	export default {
 		data() {
 			return {
-				tabIndex: 1,
+				tabIndex: 1,
+				list: []
 			}
+		},
+		onLoad() {
+			this.getList();
 		},
-		methods: {
-			tabItem(i){
-				this.tabIndex = i;
-			}
+		methods: {
+			//获取搭讪列表
+			async getList() {
+				const { code, data } = await this.$api.findAccost({
+					userId: uni.getStorageSync("userInfo").id
+				}) 
+				if(code == 200){
+					this.list = data;
+				}
+			},
+			//设置默认
+			async toSet(index) {
+				const { code, data } = await this.$api.setAccostDefault({
+					userId: uni.getStorageSync("userInfo").id,
+					id: this.list[index].id
+				}) 
+				if(code == 200){
+					uni.showToast({
+						title: "设置成功"
+					})
+					this.getList();
+				}
+			},
 		}
 	}
 </script>
diff --git a/pages/users/feedback/add.vue b/pages/users/feedback/add.vue
index 0a2d63c..798e841 100644
--- a/pages/users/feedback/add.vue
+++ b/pages/users/feedback/add.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="add">
-		<view class="add-hd">如需尽快解决问题，可直接联系在线客服<image src="@/static/jiantou1.png"></image></view>
+		<view class="add-hd" @click="getConfigData()">如需尽快解决问题，可直接联系在线客服<image src="@/static/jiantou1.png"></image></view>
 		<view class="add-content">
-			<view class="content">
+			<!-- <view class="content">
 				<view class="title"><text class="red">*</text>反馈类型</view>
 				<view class="tab">
 					<view class="li" :class="tabIndex == 1?'li-on':''" @click="tabItem(1)">界面</view>
@@ -13,24 +13,24 @@
 						<view class="picker picker-on">请选择</view>
 					</picker>
 				</view>
-			</view>
+			</view> -->
 			<view class="content">
 				<view class="title"><text class="red">*</text>反馈内容</view>
 				<view class="box">
-					<textarea maxlength="200" placeholder="如有必要，请详细描述(200字以内)~"></textarea>
-					<view class="tips">0/200字</view>
+					<textarea v-model="content" maxlength="200" placeholder="如有必要，请详细描述(200字以内)~"></textarea>
+					<view class="tips">{{content.length}}/200字</view>
 				</view>
 			</view>
 			<view class="content">
 				<view class="title"><text class="red">*</text>图片上传<text class="hs">(上传聊天截图或与问题描述相关的图片)</text></view>
 				<view class="list">
-					<view class="item">
-						<image class="pic" src="@/static/1.png"></image>
-						<image class="del" src="@/static/fabu-cha.png"></image>
-					</view>
-					<view class="upload">
-						<image class="pic" src="@/static/fankui-tianjia.png"></image>
-						<view class="txt">上传图片</view>
+					<view class="item" v-for="(a,i) in imgurl" :key="i">
+						<image class="pic" :src="a"></image>
+						<image class="del" @click="toDel(i)" src="@/static/fabu-cha.png"></image>
+					</view>
+					<view class="upload" @click="uploadImg()">
+						<image class="pic" src="@/static/fankui-tianjia.png"></image>
+						<view class="txt">上传图片</view>
 					</view>
 				</view>
 			</view>
@@ -38,23 +38,23 @@
 				<view class="title"><text class="red">*</text>联系方式</view>
 				<view class="list">
 					<view class="dd">
-						<input type="text" placeholder="请填写您的姓名"/>
+						<input v-model="name" type="text" placeholder="请填写您的姓名"/>
 					</view>
 					<view class="dd">
-						<input type="text" placeholder="请填写您的电话或邮箱"/>
+						<input v-model="phone" type="text" placeholder="请填写您的电话"/>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="add-fd">
-			<view class="btn">提交反馈</view>
-			<view class="history">反馈记录 ></view>
+			<view class="btn" @click="toReg()">提交反馈</view>
+			<view class="history" @click="toPage()">反馈记录 ></view>
 		</view>
 		<u-popup v-model="show" mode="center" border-radius="20" :mask-close-able="true">
 			<view class="feed">
 				<image src="@/static/feed-01.png"></image>
 				<view class="title">反馈提交成功</view>
-				<view class="btn">我知道了</view>
+				<view class="btn" @click="show = false">我知道了</view>
 			</view>
 		</u-popup>
 	</view>
@@ -64,14 +64,141 @@
 	export default {
 		data() {
 			return {
-				show: false,
-				tabIndex: 1
+				show: false,
+				imgurl: [],
+				content: "",
+				tabIndex: 1,
+				name: "",
+				phone: ""
 			};
 		},
-		methods: {
-			tabItem(index) {
-				this.tabIndex = index;
-			}
+		methods: {
+			toPage() {
+				uni.navigateTo({
+					url: "/pages/users/feedback/list"
+				})
+			},
+			//字典查询
+			async getConfigData() {
+				const that = this;
+				let res1 = await that.$api.getConfigData({dictType: 'CONFIG_CUSTOMER_SERVICE_USERID'});
+				if(res1.data.content){
+					that.toChat(res1.data.content)
+				}
+			},
+			//去聊天
+			async toChat(sellerId) {
+				const { code, data } = await this.$api.findZegoToken({
+					userId: uni.getStorageSync("userInfo").id,
+					sellerId
+				})
+				if(code == 200){
+					uni.setStorageSync("chatToken",data.token);
+					uni.navigateTo({
+						url: "/pages/users/chat?id="+sellerId+"&roomId="+data.roomId
+					})
+				}
+			},
+			//上传图片
+			uploadImg() {
+				const that = this
+				uni.chooseImage({
+					count: 9-that.imgurl.length,
+					sizeType: ["original"], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ["album", "camera"],
+					success: (res1) => {
+						console.log(res1)
+						for(var i = 0; i<res1.tempFilePaths.length;i++){
+							uni.uploadFile({
+								name: 'file',
+								url: that.$baseUrl+'/prod-api/common/upload',
+								filePath: res1.tempFilePaths[i],
+								success: (res) => {
+									const {code, fileName, url, msg} = JSON.parse(res.data);
+									if(code == 200){
+										uni.showToast({
+											title: "上传成功"
+										})
+										that.imgurl.push(url)
+									}else{
+										uni.showToast({
+											icon: "error",
+											title: "上传失败"
+										})
+									}
+								},
+								fail: (err) => {
+									console.log(err)
+								}
+							});	
+						}
+					},
+					fail(err){
+						console.log("fail",err)
+					}
+				});
+			},
+			async toReg() {
+				const that = this;
+				if(!that.content){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "反馈内容不能为空！"
+					})
+					return ;
+				}
+				if(that.imgurl.length == 0){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "请上传图片"
+					})
+					return ;
+				}
+				if(!that.name){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "姓名不能为空！"
+					})
+					return ;
+				}
+				if(!that.phone){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "电话不能为空！"
+					})
+					return ;
+				}
+				const { code, data, msg } = await that.$api.feedback({
+					userId: uni.getStorageSync("userInfo").id,
+					content: that.content,
+					imgurl: that.imgurl.join(","),
+					name: that.name,
+					phone: that.phone
+				})
+				if(code == 200){
+					that.imgurl = [];
+					that.content = "";
+					that.name = "";
+					that.phone = "";
+					that.show = true;
+				}else{
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: msg
+					})
+				}
+			},
+			tabItem(index) {
+				this.tabIndex = index;
+			},
+			toDel(i) {
+				this.imgurl.splice(i,1)
+			},
 		}
 	}
 </script>
diff --git a/pages/users/feedback/detail.vue b/pages/users/feedback/detail.vue
index 54b559b..f5be6d4 100644
--- a/pages/users/feedback/detail.vue
+++ b/pages/users/feedback/detail.vue
@@ -1,26 +1,18 @@
 <template>
 	<view class="feed">
 		<view class="content">
-			<view class="item">
-				<view class="fl">反馈类型</view>
-				<view class="fr">界面</view>
-			</view>
-			<view class="item">
-				<view class="fl">问题分类</view>
-				<view class="fr">体验不好</view>
-			</view>
 			<view class="item">
 				<view class="fl">姓名</view>
-				<view class="fr">李</view>
+				<view class="fr">{{info.name}}</view>
 			</view>
 			<view class="item">
-				<view class="fl">电话/邮箱</view>
-				<view class="fr">13078980980</view>
+				<view class="fl">电话</view>
+				<view class="fr">{{info.phone}}</view>
 			</view>
 			<view class="items">
-				<view class="fl">体验不好</view>
+				<view class="fl">{{info.content}}</view>
 				<view class="fr">
-					<image v-for="i in 4" :key="i" src="@/static/pic.jpg"></image>
+					<image v-for="(a,i) in info.imgurls" mode="aspectFill" :key="i" :src="a" @click="perviewimage(i)"></image>
 				</view>
 			</view>
 		</view>
@@ -31,8 +23,22 @@
 	export default {
 		data() {
 			return {
-				
+				info: {}
 			};
+		},
+		onLoad() {
+			this.info=uni.getStorageSync("pcontent");
+			if(this.info.imgurl && this.info){
+				this.info.imgurls = this.info.imgurl.split(",")
+			}
+		},
+		methods: {
+			perviewimage(index) {
+				uni.previewImage({
+					urls: this.info.imgurls,
+					current: index
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/users/feedback/list.vue b/pages/users/feedback/list.vue
index e182d01..8a605df 100644
--- a/pages/users/feedback/list.vue
+++ b/pages/users/feedback/list.vue
@@ -1,13 +1,17 @@
 <template>
 	<view class="feed">
-		<view class="item">
+		<view class="item" v-for="(a,i) in list" :key="i" @click="toPage(a)">
 			<view class="fl">
-				<view class="title">体验不好  测试以下</view>
-				<view class="desc">2024-03-03 23:22:22</view>
+				<view class="title">{{a.content}}</view>
+				<view class="desc">{{a.createTime}}</view>
 			</view>
 			<view class="fr">
 				<image src="@/static/icon-arrow.png"></image>
 			</view>
+		</view>
+		<view class="empty" v-if="isShow">
+			<image src="@/static/empty.png"></image>
+			<view class="txt">暂无数据</view>
 		</view>
 	</view>
 </template>
@@ -16,16 +20,50 @@
 	export default {
 		data() {
 			return {
-				
+				list: [],
+				isShow: false
 			};
-		}
+		},
+		onLoad() {
+			this.getList();
+		},
+		methods: {
+			toPage(a) {
+				uni.setStorageSync("pcontent",a);
+				uni.navigateTo({
+					url: "/pages/users/feedback/detail"
+				})
+			},
+			async getList() {
+				const {code,data} = await this.$api.feedbackList({
+					userId: uni.getStorageSync("userInfo").id
+				})
+				if(code == 200){
+					this.isShow = data.length == 0?true:false;
+					this.list = data;
+				}
+			}
+		},
 	}
 </script>
 
 <style scoped lang="scss">
 .feed{
 	padding: 0 25rpx 25rpx;
-	overflow: hidden;
+	overflow: hidden;
+	.empty{
+		padding: 150rpx 0;
+		text-align: center;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #222222;
+		image{
+			display: block;
+			width: 460rpx;
+			height: 400rpx;
+			margin: 0 auto;
+		}
+	}
 	.item{
 		height: 150rpx;
 		background: #FFFFFF;
diff --git a/pages/users/help/index.vue b/pages/users/help/index.vue
index c47061f..a6ed870 100644
--- a/pages/users/help/index.vue
+++ b/pages/users/help/index.vue
@@ -1,83 +1,23 @@
 <template>
 	<view class="help">
-		<view class="help-dl" :class="tabIndex == 1?'help-dl-on':''" @click="tabItem(1)">
+		<view class="help-dl" v-for="(a,i) in list" :key="i" :class="a.isClick?'help-dl-on':''" @click="tabItem(i)">
 			<view class="dt">
-				<image class="icon" src="@/static/icon-help-01.png"></image>
+				<image class="icon" :src="a.icon"></image>
 				<view class="info">
-					<view class="fl">账号问题<text>账号注册、绑定、密码修改等</text></view>
+					<view class="fl">{{a.title}}<text>{{a.content}}</text></view>
 					<view class="fr">
-						<image class="img2" src="@/static/icon-help-up.png"></image>
-						<image class="img1" src="@/static/icon-help-down.png"></image>
+						<image class="img2" v-if="a.isClick" src="@/static/icon-help-up.png"></image>
+						<image class="img1" v-else src="@/static/icon-help-down.png"></image>
 					</view>
 				</view>
 			</view>
 			<view class="dd">
-				<view class="item">
-					绑定手机<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					绑定微信<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					注销账号<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					是否支持多设备登录<image src="@/static/icon-help-right.png"></image>
-				</view>
-			</view>
-		</view>
-		<view class="help-dl" :class="tabIndex == 2?'help-dl-on':''" @click="tabItem(2)">
-			<view class="dt">
-				<image class="icon" src="@/static/icon-help-02.png"></image>
-				<view class="info">
-					<view class="fl">购买问题<text>墨刀会员购买、充值、续费等</text></view>
-					<view class="fr">
-						<image class="img2" src="@/static/icon-help-up.png"></image>
-						<image class="img1" src="@/static/icon-help-down.png"></image>
-					</view>
-				</view>
-			</view>
-			<view class="dd">
-				<view class="item">
-					绑定手机<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					绑定微信<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					注销账号<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					是否支持多设备登录<image src="@/static/icon-help-right.png"></image>
-				</view>
-			</view>
-		</view>
-		<view class="help-dl" :class="tabIndex == 3?'help-dl-on':''" @click="tabItem(3)">
-			<view class="dt">
-				<image class="icon" src="@/static/icon-help-03.png"></image>
-				<view class="info">
-					<view class="fl">发票问题<text>发票信息、开票进度等</text></view>
-					<view class="fr">
-						<image class="img2" src="@/static/icon-help-up.png"></image>
-						<image class="img1" src="@/static/icon-help-down.png"></image>
-					</view>
-				</view>
-			</view>
-			<view class="dd">
-				<view class="item">
-					绑定手机<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					绑定微信<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					注销账号<image src="@/static/icon-help-right.png"></image>
-				</view>
-				<view class="item">
-					是否支持多设备登录<image src="@/static/icon-help-right.png"></image>
+				<view class="item" v-for="(b,idx) in a.contentList" :key="idx" @click="toPage(a)">
+					{{b.title}}<image src="@/static/icon-help-right.png"></image>
 				</view>
 			</view>
 		</view>
+		
 	</view>
 </template>
 
@@ -85,13 +25,34 @@
 	export default {
 		data() {
 			return {
-				tabIndex: 1
+				tabIndex: 0,
+				list: [],
 			};
+		},
+		onLoad() {
+			this.getList();
 		},
-		methods: {
+		methods: {
+			toPage(a) {
+				uni.setStorageSync("pcontent",a)
+				uni.navigateTo({
+					url: "/pages/users/xieyi/index"
+				})
+			},
 			tabItem (index) {
-				this.tabIndex = index;
-			}
+				this.list[index].isClick = !this.list[index].isClick;
+			},
+			async getList() {
+				let { code, data } = await this.$api.helpCenter({});
+				if(code == 200){
+					if(data && data.length > 0){
+						data.map(a=>{
+							a.isClick = false
+						})
+					}
+					this.list = data
+				}
+			},
 		}
 	}
 </script>
diff --git a/pages/users/notice/index.vue b/pages/users/notice/index.vue
index 3d1d483..af844e9 100644
--- a/pages/users/notice/index.vue
+++ b/pages/users/notice/index.vue
@@ -3,11 +3,11 @@
 		<view class="content">
 			<view class="item">
 				<view class="a">新消息提示音</view>
-				<u-switch active-color="#000000" v-model="checked"></u-switch>
+				<u-switch active-color="#000000" v-model="checked" @change="changeChecked()"></u-switch>
 			</view>
 			<view class="item">
 				<view class="a">新消息震动</view>
-				<u-switch active-color="#000000" v-model="checked"></u-switch>
+				<u-switch active-color="#000000" v-model="checked1" @change="changeChecked1()"></u-switch>
 			</view>
 		</view>
 	</view>
@@ -17,8 +17,63 @@
 	export default {
 		data() {
 			return {
-				checked: true
+				checked: false,
+				checked1: false
 			};
+		},
+		onLoad() {
+			this.getUserInfo();
+		},
+		methods: {
+			//查询个人信息
+			async getUserInfo() {
+				const { code, data , msg } = await this.$api.findUserInfo({userId: uni.getStorageSync("userInfo").id});
+				if(code == 200){
+					this.checked = (data.msgVoice == 1?true:false)
+					this.checked1 = (data.msgShock == 1?true:false)
+					uni.setStorageSync("userInfo",data);
+				}else{
+					uni.showToast({
+						title: mgs,
+						position: "bottom",
+						icon: "none",
+					})
+				}
+			},
+			async changeChecked(e) {
+				const { code, data, msg } = await this.$api.privacyConfig({
+					"userId": uni.getStorageSync("userInfo").id,
+					"msgVoice": this.checked?1:0 //新消息提示音：0未开启1开启
+				});
+				if(code == 200){
+					uni.showToast({
+						title: "修改成功"
+					})
+				}else{
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: msg
+					})
+				}
+			},
+			async changeChecked1(e) {
+				const { code, data, msg } = await this.$api.privacyConfig({
+					"userId": uni.getStorageSync("userInfo").id,
+					"msgShock": this.checked1?1:0 //新消息震动：0未开启1开启
+				});
+				if(code == 200){
+					uni.showToast({
+						title: "修改成功"
+					})
+				}else{
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: msg
+					})
+				}
+			}
 		}
 	}
 </script>
diff --git a/pages/users/qingshaonian/detail.vue b/pages/users/qingshaonian/detail.vue
index b8249de..969baf9 100644
--- a/pages/users/qingshaonian/detail.vue
+++ b/pages/users/qingshaonian/detail.vue
@@ -4,15 +4,15 @@
 		<view class="bd">
 			<view class="item">
 				<image src="@/static/qingshaonian-lock.png"></image>
-				<input type="password" placeholder="输入密码" />
+				<input v-model="teenagePsw" type="password" placeholder="输入密码" />
 			</view>
 			<view class="item">
 				<image src="@/static/qingshaonian-lock.png"></image>
-				<input type="password" placeholder="输入密码" />
+				<input v-model="teenagePsw1" type="password" placeholder="确认密码" />
 			</view>
 		</view>
 		<view class="fd">
-			<view class="btn">确定开启</view>
+			<view class="btn" @click="openTeenageMode()">确定开启</view>
 		</view>
 	</view>
 </template>
@@ -21,11 +21,47 @@
 	export default {
 		data() {
 			return {
-				
+				teenagePsw: "",
+				teenagePsw1: ""
 			}
 		},
 		methods: {
-			
+			//提交
+			async openTeenageMode() {
+				if(!this.teenagePsw){
+					uni.showToast({
+						title: "密码不能为空！",
+						position: "bottom",
+						icon: "none",
+					})
+					return ;
+				}
+				if(this.teenagePsw != this.teenagePsw1){
+					uni.showToast({
+						title: "密码不一致！",
+						position: "bottom",
+						icon: "none",
+					})
+					return ;
+				}
+				const { code, data , msg } = await this.$api.openTeenageMode({teenagePsw: this.teenagePsw,userId: uni.getStorageSync("userInfo").id});
+				if(code == 200){
+					uni.showToast({
+						title: "提交成功",
+					})
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta: 2
+						})
+					},2000)
+				}else{
+					uni.showToast({
+						title: mgs,
+						position: "bottom",
+						icon: "none",
+					})
+				}
+			},
 		}
 	}
 </script>
diff --git a/pages/users/qingshaonian/index.vue b/pages/users/qingshaonian/index.vue
index 52810a9..cba0c0a 100644
--- a/pages/users/qingshaonian/index.vue
+++ b/pages/users/qingshaonian/index.vue
@@ -2,44 +2,151 @@
 	<view class="qingshaonian">
 		<view class="bd">
 			<image src="@/static/qingshaonian-san.png"></image>
-			<!-- <view class="title">青少年模式已开启</view> -->
-			<view class="title">青少年模式未开启</view>
-			<!-- <view class="desc">关闭后，所有行为将不受限制</view> -->
-			<view class="desc">开启时，以下行为会收到限制：</view>
-			<view class="item">
+			<view class="title" v-if="userInfo.teenageMode == 1">青少年模式已开启</view>
+			<view class="title" v-else>青少年模式未开启</view>
+			<view class="desc" v-if="userInfo.teenageMode == 1">关闭后，所有行为将不受限制</view>
+			<view class="desc" v-else>开启时，以下行为会收到限制：</view>
+			<view class="item" v-if="userInfo.teenageMode == 0">
 				<image src="@/static/qingshaonian-yuan.png"></image>无法进行充值
 			</view>
-			<view class="item">
+			<view class="item" v-if="userInfo.teenageMode == 0">
 				<image src="@/static/qingshaonian-yuan.png"></image>部分功能无法使用
 			</view>
 		</view>
 		<view class="fd">
-			<!-- <view class="btn">关闭</view> -->
-			<view class="btn">开启青少年模式</view>
-		</view>
+			<view class="btn" @click="openPage()" v-if="userInfo.teenageMode == 0">开启青少年模式</view>
+			<view class="btn" @click="isPopup = true" v-else>关闭</view>
+		</view>
+		<u-popup v-model="isPopup" mode="center" border-radius="20" :mask-close-able="false">
+			<view class="qingshaonians">
+				<view class="titles">输入密码<image @click="isPopup = false" src="@/static/cha.png"></image></view>
+				<view class="contents">
+					<view class="p">解除青少年模式密码</view>
+					<view class="box">
+						<u-icon name="lock-fill"></u-icon>
+						<input v-model="teenagePsw" type="password" placeholder="输入密码" />
+					</view>
+				</view>
+				<view class="fds">
+					<view class="btns" @click="toReg">确定关闭</view>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {
-				
+			return {
+				isPopup: false,
+				userInfo: {},
+				teenagePsw: ""
 			}
+		},
+		onShow() {
+			this.userInfo = uni.getStorageSync("userInfo")
 		},
-		methods: {
-			
+		methods: {
+			async toReg() {
+				if(!this.teenagePsw){
+					uni.showToast({
+						title: "密码不能为空！",
+						position: "bottom",
+						icon: "none",
+					})
+					return ;
+				}
+				this.isPopup = false
+				const { code, data , msg } = await this.$api.closeTeenageMode({teenagePsw: this.teenagePsw,userId: uni.getStorageSync("userInfo").id});
+				if(code == 200){
+					uni.showToast({
+						title: "提交成功",
+					})
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta: 1
+						})
+					},2000)
+				}else{
+					uni.showToast({
+						title: mgs,
+						position: "bottom",
+						icon: "none",
+					})
+				}
+			},
+			openPage() {
+				uni.navigateTo({
+					url: "/pages/users/qingshaonian/detail"
+				})
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-page{
-	background-color: #fff;
-}
-.qingshaonian{
+.qingshaonian{
+	background-color: #fff;
+	min-height: 100vh;
 	padding: 0 25rpx;
-	overflow: hidden;
+	overflow: hidden;
+	.qingshaonians{
+		overflow: hidden;
+		width: 670rpx;
+		height: 520rpx;
+		background: #FFFFFF;
+		box-sizing: border-box;
+		.titles{
+			text-align: center;
+			font-weight: 500;
+			font-size: 36rpx;
+			color: #222222;
+			padding: 40rpx 0;
+			border-bottom: 1px solid #EAEAEA;
+			image{
+				width: 45rpx;
+				height: 45rpx;
+				float: right;
+				margin-right: 20rpx;
+			}
+		}
+		.contents{
+			padding: 30rpx;
+			.p{
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #222222;
+			}
+			.box{
+				font-weight: 500;
+				display: flex;
+				padding: 30rpx 0;
+				align-items: center;
+				border-bottom: 1px solid #EAEAEA;
+				margin-top: 20rpx;
+				input{
+					flex: 1;
+					margin-left: 30rpx;
+					font-size: 30rpx;
+					color: #222222;
+				}
+			}
+		}
+		.btns{
+			width: 400rpx;
+			line-height: 80rpx;
+			background: linear-gradient(0deg, #000000, #3D3B38);
+			box-shadow: 0px 4rpx 18rpx 0px rgba(42,41,39,0.34);
+			border-radius: 80rpx;
+			text-align: center;
+			font-weight: 500;
+			font-size: 26rpx;
+			color: #FFFFFF;
+			margin: 0 auto;
+			margin-top: 50rpx;
+		}
+	}
 	.fd{
 		width: 100%;
 		position: fixed;
diff --git a/pages/users/recharge/index.vue b/pages/users/recharge/index.vue
index 756e03b..904c133 100644
--- a/pages/users/recharge/index.vue
+++ b/pages/users/recharge/index.vue
@@ -76,7 +76,14 @@
 			},
 			//创建订单
 			async toCreate() {
-				const that = this;
+				const that = this;
+				if(this.userInfo.teenageMode == 1){
+					uni.showModal({
+						title: "温馨提示",
+						content: "已开启青少年模式，该功能已关闭"
+					})
+					return ;
+				}
 				if(!this.payType){
 					uni.showToast({
 						icon: "none",
@@ -142,7 +149,7 @@
 			async getList() {
 				const { code, data } = await this.$api.mealsetList({page: 1,limit: 9999});
 				if(code == 200){
-					this.list = data;
+					this.list = data.list;
 				}
 			},
 			//字典查询
diff --git a/pages/users/site/index.vue b/pages/users/site/index.vue
index 519cb72..9242557 100644
--- a/pages/users/site/index.vue
+++ b/pages/users/site/index.vue
@@ -1,31 +1,31 @@
 <template>
 	<view class="site">
 		<view class="site-hd">
-			<view class="item">
+			<view class="item" @click="openPage('/pages/users/yinsi/index')">
 				<view class="a">隐私设置</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" @click="openPage('/pages/users/notice/index')">
 				<view class="a">新消息通知</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" @click="openPage('/pages/users/qingshaonian/index')">
 				<view class="a">青少年模式</view>
-				<view class="b">未开启
+				<view class="b">{{userInfo.teenageMode == 0?'未开启':'已开启'}}
 					<image src="@/static/icon-arrow.png"></image>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" @click="openPage('/pages/login/password')">
 				<view class="a">修改密码</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" @click="openPage('/pages/users/dashan/index')">
 				<view class="a">搭讪语设置</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
@@ -33,7 +33,7 @@
 			</view>
 		</view>
 		<view class="site-hd">
-			<view class="item">
+			<view class="item" @click="openPage('/pages/xiaoxi/heimingdan')">
 				<view class="a">黑名单</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
@@ -41,25 +41,25 @@
 			</view>
 		</view>
 		<view class="site-hd">
-			<view class="item">
+			<view class="item" @click="openPage('/pages/users/about/index?type=CONFIG_ABOUT_AS')">
 				<view class="a">关于我们</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" @click="openPage('/pages/users/about/index?type=CONFIG_PRIVACY_POLICY')">
 				<view class="a">隐私协议</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" @click="openPage('/pages/users/about/index?type=CONFIG_USER_AGREEMENT')">
 				<view class="a">用户协议</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" @click="openPage('/pages/users/zhuxiao/index')">
 				<view class="a">注销账号</view>
 				<view class="b">
 					<image src="@/static/icon-arrow.png"></image>
@@ -67,23 +67,9 @@
 			</view>
 		</view>
 		<view class="site-fd">
-			<view class="btn" @click="openPage(1)">退出登录</view>
+			<view class="btn" @click="toLoginOut()">退出登录</view>
 		</view>
-		<u-popup v-model="isPopup" mode="center" border-radius="20" :mask-close-able="false">
-			<view class="qingshaonian">
-				<view class="title">输入密码<image src="@/static/cha.png"></image></view>
-				<view class="content">
-					<view class="p">解除青少年模式密码</view>
-					<view class="box">
-						<u-icon name="lock-fill"></u-icon>
-						<input type="password" placeholder="输入密码" />
-					</view>
-				</view>
-				<view class="fd">
-					<view class="btn">确定关闭</view>
-				</view>
-			</view>
-		</u-popup>
+		
 	</view>
 </template>
 
@@ -91,25 +77,54 @@
 	export default {
 		data() {
 			return {
-				isPopup: false
+				isPopup: false,
+				userInfo: {},
 			};
+		},
+		onShow() {
+			this.getUserInfo();
 		},
-		methods: {
-			openPage(index) {
-				if(index == 1){
-					uni.showModal({
-						title: "温馨提示",
-						content: "是否确认推出登录?",
-						success(res){
-							if(res.confirm){
-								uni.navigateBack({
-									delta: 1
-								})
-							}
+		methods: {
+			//查询个人信息
+			async getUserInfo() {
+				const { code, data , msg } = await this.$api.findUserInfo({userId: uni.getStorageSync("userInfo").id});
+				if(code == 200){
+					this.userInfo = data;
+					uni.setStorageSync("userInfo",data);
+				}else{
+					uni.showToast({
+						title: mgs,
+						position: "bottom",
+						icon: "none",
+					})
+				}
+			},
+			openPage(url){
+				uni.navigateTo({
+					url
+				})
+			},
+			toLoginOut() {
+				const that = this;
+				uni.showModal({
+					title: "温馨提示",
+					content: "是否确认退出登录?",
+					confirmColor: "#000",
+					success(res){
+						if(res.confirm){
+							uni.clearStorageSync();
+							uni.showToast({
+								title: "退出成功"
+							})
+							setTimeout(()=>{
+								uni.reLaunch({
+									url: "/pages/login/index"
+								})
+							},2000)
 						}
-					})
-				}
-			}
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -119,61 +134,7 @@
 	padding: 0 25rpx;
 	overflow: hidden;
 	padding-bottom: 110rpx;
-	.qingshaonian{
-		overflow: hidden;
-		width: 670rpx;
-		height: 520rpx;
-		background: #FFFFFF;
-		box-sizing: border-box;
-		.title{
-			text-align: center;
-			font-weight: 500;
-			font-size: 36rpx;
-			color: #222222;
-			padding: 40rpx 0;
-			border-bottom: 1px solid #EAEAEA;
-			image{
-				width: 45rpx;
-				height: 45rpx;
-				float: right;
-				margin-right: 20rpx;
-			}
-		}
-		.content{
-			padding: 30rpx;
-			.p{
-				font-weight: 500;
-				font-size: 30rpx;
-				color: #222222;
-			}
-			.box{
-				font-weight: 500;
-				display: flex;
-				padding: 30rpx 0;
-				align-items: center;
-				border-bottom: 1px solid #EAEAEA;
-				margin-top: 20rpx;
-				input{
-					margin-left: 30rpx;
-					font-size: 30rpx;
-					color: #222222;
-				}
-			}
-		}
-		.btn{
-			width: 400rpx;
-			line-height: 80rpx;
-			background: linear-gradient(0deg, #000000, #3D3B38);
-			box-shadow: 0px 4rpx 18rpx 0px rgba(42,41,39,0.34);
-			border-radius: 80rpx;
-			text-align: center;
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			margin-top: 50rpx;
-		}
-	}
+	
 	&-hd{
 		width: 100%;
 		background: #FFFFFF;
diff --git a/pages/users/team/index.vue b/pages/users/team/index.vue
index 17b8334..27a1b86 100644
--- a/pages/users/team/index.vue
+++ b/pages/users/team/index.vue
@@ -1,23 +1,26 @@
 <template>
 	<view class="dashan">
 		<view class="hd">
-			<view class="a"><text>10</text>人</view>
+			<view class="a"><text>{{list.length}}</text>人</view>
 			<view class="a">我的团队人数</view>
 		</view>
 		<view class="list">
-			<view class="item" v-for="i in 5" :key="i">
+			<view class="item" v-for="(a,i) in list" :key="i">
 				<view class="pic">
-					<!-- 只有会员才可以看到 -->
-					<image src="@/static/avatar.png"></image>
+					<image :src="a.faceImage?a.faceImage:a.img"></image>
 				</view>
 				<view class="content">
 					<view class="info">
-						<view class="name">李同学</view>
-						<view class="desc">ID：1568935688</view>
+						<view class="name">{{a.nickname}}</view>
+						<view class="desc">ID：{{a.id}}</view>
 					</view>
-					<view class="btns">2023-09-23</view>
+					<view class="btns">{{a.createTime}}</view>
 				</view>
 			</view>
+		</view>
+		<view class="empty" v-if="isShow">
+			<image src="@/static/empty.png"></image>
+			<view class="txt">暂无数据</view>
 		</view>
 	</view>
 </template>
@@ -25,11 +28,25 @@
 <script>
 	export default {
 		data() {
-			return {
-				
+			return {
+				isShow: false,
+				list: []
 			};
+		},
+		onLoad() {
+			this.getList();
 		},
-		methods: {
+		methods: {
+			//查询列表
+			async getList() {
+				const { code, data } = await this.$api.myTeam({
+					userId: uni.getStorageSync("userInfo").id
+				});
+				if(code == 200){
+					this.isShow = (data.length >0?false:true);
+					this.list = data;
+				}
+			},
 			openSheet() {
 				uni.showActionSheet({
 					itemList: ["删除会话"],
@@ -43,12 +60,24 @@
 </script>
 
 <style scoped lang="scss">
-page{
+.dashan{
+	min-height: 100vh;
 	background-color: #fff;
-}
-.dashan{
 	padding: 0 25rpx;
-	overflow: hidden;
+	overflow: hidden;
+	.empty{
+		padding: 150rpx 0;
+		text-align: center;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #222222;
+		image{
+			display: block;
+			width: 460rpx;
+			height: 400rpx;
+			margin: 0 auto;
+		}
+	}
 	.hd{
 		width: 702rpx;
 		height: 190rpx;
diff --git a/pages/users/xieyi/index.vue b/pages/users/xieyi/index.vue
index 8c3b35f..2ef0c70 100644
--- a/pages/users/xieyi/index.vue
+++ b/pages/users/xieyi/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="content" v-html="content">
 		
 	</view>
 </template>
@@ -8,12 +8,29 @@
 	export default {
 		data() {
 			return {
-				
+				content: ""
 			};
+		},
+		onLoad() {
+			this.content=uni.getStorageSync("pcontent").content.replace(/style=""/g, '')
+								.replace(/<img " src=/g, '<img src=')
+								.replace(/<img src=/g, '<img style="width: 100%; height:100%; display:block" src=');
+								uni.setNavigationBarTitle({
+									title: uni.getStorageSync("pcontent").title
+								})
+		},
+		destroyed() {
+			uni.removeStorageSync("pcontent")
 		}
 	}
 </script>
 
-<style lang="scss">
-
+<style scoped lang="scss">
+.content{
+	padding: 25rpx;
+	overflow: hidden;
+	font-size: 28rpx;
+	color: #333;
+}
 </style>
+
diff --git a/pages/users/yinsi/index.vue b/pages/users/yinsi/index.vue
index a428c39..ccc1c16 100644
--- a/pages/users/yinsi/index.vue
+++ b/pages/users/yinsi/index.vue
@@ -3,7 +3,7 @@
 		<view class="content">
 			<view class="item">
 				<view class="a">隐藏我的城市</view>
-				<u-switch active-color="#000000" v-model="checked"></u-switch>
+				<u-switch active-color="#000000" v-model="checked" @change="changeChecked"></u-switch>
 			</view>
 		</view>
 	</view>
@@ -13,8 +13,46 @@
 	export default {
 		data() {
 			return {
-				checked: true
+				checked: false
 			};
+		},
+		onLoad() {
+			this.getUserInfo();
+		},
+		methods: {
+			//查询个人信息
+			async getUserInfo() {
+				const { code, data , msg } = await this.$api.findUserInfo({userId: uni.getStorageSync("userInfo").id});
+				if(code == 200){
+					this.city_hide = (data.cityHide == 0?true:false)
+					uni.setStorageSync("userInfo",data);
+				}else{
+					uni.showToast({
+						title: mgs,
+						position: "bottom",
+						icon: "none",
+					})
+				}
+			},
+			async changeChecked(e) {
+				this.checked = e;
+				console.log(e)
+				const { code, data, msg } = await this.$api.privacyConfig({
+					"userId": uni.getStorageSync("userInfo").id,
+					"cityHide": this.checked?1:0 //隐藏我的城市：0不隐藏1隐藏
+				});
+				if(code == 200){
+					uni.showToast({
+						title: "修改成功"
+					})
+				}else{
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: msg
+					})
+				}
+			}
 		}
 	}
 </script>
diff --git a/pages/users/zhuxiao/index.vue b/pages/users/zhuxiao/index.vue
index fdcd9f1..29015d7 100644
--- a/pages/users/zhuxiao/index.vue
+++ b/pages/users/zhuxiao/index.vue
@@ -1,19 +1,17 @@
 <template>
 	<view class="zhuxiao">
 		<view class="title">注销后，你账号将：</view>
-		<view class="content">
-			<text>
-				1、账号相关信息将被移除，你的好友无法再与你取得联系(包括好友、关注、粉丝等);\n2、账户剩余金币、积分、魅力值、财富值、VIP等收益相关数据在注销成功后将清空，如产生利益损失，由账号注销发起者承担;\n3、绑定手机好或第三方账号将会解绑，解绑后可再次注册账号;\n4、你的实名信息会解绑，解绑后可以再次绑定其他账号;\n5、账号将会被系统收回，并对平台其他用户开放申请;\n提示:一旦注销将无法撤销，账号将自动清除，15天后方可从新注册，请慎重!!!
-			</text>
+		<view class="content" v-html="content">
+			
 		</view>
 		<view class="fd">
 			<view class="xieyi" @click="toToggle()">
-				<image v-if="isCheck" src="@/static/icon-select.png"></image>
+				<image v-if="isCheck ==false" src="@/static/icon-select.png"></image>
 				<image v-else src="@/static/icon-select-on.png"></image>我已认真阅读且同意注销账号需要注意的内容
 			</view>
 			<view class="btns">
-				<view class="cancle">取消</view>
-				<view class="sure">确定</view>
+				<view class="cancle" @click="toCancle">取消</view>
+				<view class="sure" @click="toClick">确定</view>
 			</view>
 		</view>
 		
@@ -24,19 +22,78 @@
 	export default {
 		data() {
 			return {
-				isCheck: false
+				isCheck: false,
+				content: ""
 			};
+		},
+		onLoad() {
+			this.getInfo()
+		},
+		methods: {
+			toToggle() {
+				this.isCheck = !this.isCheck
+			},
+			toClick() {
+				const that = this;
+				if(this.isCheck == false){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "请选择注销内容协议"
+					})
+					return ;
+				}
+				uni.showModal({
+					title: "温馨提示",
+					content: "是否要注销当前账号?",
+					async success( res) {
+						const { code, data, msg } = await this.$api.cancelAccount({userId: uni.getStorageSync("userInfo").id});
+						if(code == 200){
+							uni.showToast({
+								title: "注销成功",
+							})
+							uni.clearStorageSync();
+							setTimeout(()=>{
+								uni.reLaunch({
+									url: "/pages/login/index"
+								})
+							},2000)
+						}else{
+							uni.showToast({
+								icon: "none",
+								position: "bottom",
+								title: msg
+							})
+						}
+					}
+				})
+				
+			},
+			toCancle() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			async getInfo() {
+				const { code,data } = await this.$api.getConfigData({dictType: 'CONFIG_CANCEL_ACCOUNT'});
+				if(code == 200){
+					this.content = data.content.replace(/style=""/g, '')
+								.replace(/<img " src=/g, '<img src=')
+								.replace(/<img src=/g, '<img style="width: 100%; height:100%; display:block" src=');
+				
+				}
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-page{
+.zhuxiao{
+	min-height: 100vh;
 	background-color: #fff;
-}
-.zhuxiao{
-	padding: 30rpx;
-	overflow: hidden;
+	padding: 30rpx 30rpx 400rpx;
+	overflow: hidden;
+	box-sizing: border-box;
 	.title{
 		font-weight: 500;
 		font-size: 36rpx;
diff --git a/pages/xiaoxi/dashan.vue b/pages/xiaoxi/dashan.vue
index bdbf5ca..4e79a1e 100644
--- a/pages/xiaoxi/dashan.vue
+++ b/pages/xiaoxi/dashan.vue
@@ -9,6 +9,10 @@
 					<view class="name">李同学<text>晚上9:50</text></view>
 					<view class="desc">[搭讪]你好，在吗？</view>
 				</view>
+			</view>
+			<view class="empty" v-if="isShow">
+				<image src="@/static/empty.png"></image>
+				<view class="txt">暂无数据</view>
 			</view>
 		</view>
 	</view>
diff --git a/pages/xiaoxi/detail.vue b/pages/xiaoxi/detail.vue
index 8c3b35f..4c6d362 100644
--- a/pages/xiaoxi/detail.vue
+++ b/pages/xiaoxi/detail.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="content" v-html="content">
 		
 	</view>
 </template>
@@ -8,12 +8,29 @@
 	export default {
 		data() {
 			return {
-				
+				content: ""
 			};
+		},
+		onLoad() {
+			this.content=uni.getStorageSync("pcontent").noticeContent.replace(/style=""/g, '')
+								.replace(/<img " src=/g, '<img src=')
+								.replace(/<img src=/g, '<img style="width: 100%; height:100%; display:block" src=');
+								uni.setNavigationBarTitle({
+									title: uni.getStorageSync("pcontent").noticeTitle
+								})
+		},
+		destroyed() {
+			uni.removeStorageSync("pcontent")
 		}
 	}
 </script>
 
-<style lang="scss">
-
+<style scoped lang="scss">
+.content{
+	padding: 25rpx;
+	overflow: hidden;
+	font-size: 28rpx;
+	color: #333;
+}
 </style>
+
diff --git a/pages/xiaoxi/fangke.vue b/pages/xiaoxi/fangke.vue
index f574a7a..a3162ce 100644
--- a/pages/xiaoxi/fangke.vue
+++ b/pages/xiaoxi/fangke.vue
@@ -14,6 +14,10 @@
 					</view>
 					<view class="btn" @click.stop="toDash(a.userid)">搭讪</view>
 				</view>
+			</view>
+			<view class="empty" v-if="isShow">
+				<image src="@/static/empty.png"></image>
+				<view class="txt">暂无数据</view>
 			</view>
 		</view>
 		<unverified :isPopup="isPopup" />
diff --git a/pages/xiaoxi/heimingdan.vue b/pages/xiaoxi/heimingdan.vue
index 74ee225..3876fd5 100644
--- a/pages/xiaoxi/heimingdan.vue
+++ b/pages/xiaoxi/heimingdan.vue
@@ -10,7 +10,7 @@
 						<view class="name">{{a.nickname}}</view>
 						<view class="desc">{{a.declaration}}</view>
 					</view>
-					<view class="btn">已关注</view>
+					<view class="btn" @click.stop="toYichu(a.userid)">移除</view>
 				</view>
 			</view>
 			<view class="empty" v-if="isShow">
@@ -48,6 +48,21 @@
 					this.list = data;
 					this.isShow = data.length == 0?true:false
 				}
+			},
+			async toYichu(sellerId) {
+				const { code, data } = await this.$api.addOrRemoveBlacklist({
+					userId: uni.getStorageSync("userInfo").id,
+					sellerId,
+					type: 2
+				})
+				if(code == 200){
+					uni.showToast({
+						title: "移除成功"
+					})
+					setTimeout(()=>{
+						this.getList();
+					},2000)
+				}
 			},
 			toUser(id) {
 				if(uni.getStorageSync("userInfo").realnameFlag == 0){
diff --git a/pages/xiaoxi/index.vue b/pages/xiaoxi/index.vue
index 6299c88..f31b8b4 100644
--- a/pages/xiaoxi/index.vue
+++ b/pages/xiaoxi/index.vue
@@ -22,32 +22,36 @@
 			</view>
 		</view>
 		<view class="xiaoxi-list">
-			<view class="item" v-if="current == 0">
+			<view class="item" v-if="current == 0" @click="openPage('/pages/xiaoxi/dashan')">
 				<view class="pic"><image src="@/static/dashan.png"></image></view>
 				<view class="info">
 					<view class="name">搭讪消息<text>晚上9:50</text></view>
 					<view class="desc">上学和工作，哪个更快来呢？上学的...</view>
 				</view>
 			</view>
-			<view class="item" v-if="current == 0">
+			<view class="item" v-if="current == 0" @click="openPage('/pages/xiaoxi/xitong')">
 				<view class="pic"><image src="@/static/xitong.png"></image></view>
 				<view class="info">
 					<view class="name">系统消息<text>晚上9:50</text></view>
 					<view class="desc">明天再见喽！</view>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" @click="openPage('/pages/xiaoxi/fangke')">
 				<view class="pic"><image src="@/static/kan.png"></image></view>
 				<view class="info">
 					<view class="name">谁看过我<text>晚上9:50</text></view>
 					<view class="desc">对你感兴趣的人一直默默关注你</view>
 				</view>
 			</view>
-			<view class="item">
-				<view class="pic"><image src="@/static/nan.png"></image><view class="num">30</view></view>
+			<view class="item" v-for="(a,i) in frindList" :key="i">
+				<view class="pic"><image :src="a.faceImage"></image><view class="num" v-if="a.noReadCount">{{a.noReadCount}}</view></view>
 				<view class="info">
-					<view class="name">李同学<text>晚上9:50</text></view>
-					<view class="desc">在么？</view>
+					<view class="name">{{a.nickname}}<text>{{a.createTime}}</text></view>
+					<view class="desc" v-if="a.type==3">{{a.message}}</view>
+					<view class="desc" v-if="a.type==1">你有一条新的语音！</view>
+					<view class="desc" v-if="a.type==2">你有一条新的视频！</view>
+					<view class="desc" v-if="a.type==4">你有一张新的图片！</view>
+					<view class="desc" v-if="a.type==5">你有一个新的礼物！</view>
 				</view>
 			</view>
 		</view>
@@ -61,13 +65,27 @@
 				tabIndex: 0,
 				current: 0,
 				list:[{'name': '消息'},{'name': '好友'}],
-				activeStyle:{'fontSize': '35rpx'}
+				activeStyle:{'fontSize': '35rpx'},
+				frindList: [],
 			}
 		},
-		onLoad() {
-		
+		onShow() {
+			this.getList();
 		},
-		methods: {
+		methods: {
+			async getList() {
+				const { code, data } = await this.$api.findFrindList({
+					userId: uni.getStorageSync("userInfo").id
+				})
+				if(code == 200){
+					this.frindList = data
+				}
+			},
+			openPage(url) {
+				uni.navigateTo({
+					url
+				})
+			},
 			clearInfo() {
 				uni.showModal({
 					title: "提示",
diff --git a/pages/xiaoxi/xitong.vue b/pages/xiaoxi/xitong.vue
index c19ef51..88e80ba 100644
--- a/pages/xiaoxi/xitong.vue
+++ b/pages/xiaoxi/xitong.vue
@@ -1,12 +1,16 @@
 <template>
 	<view class="xitong">
-		<view class="item" v-for="i in 5" :key="i" @click="openPage(1)">
-			<view class="date">2023-01-02</view>
+		<view class="item" v-for="(a,i) in list" :key="i" @click="toPage(a)">
+			<view class="date">{{a.createTime}}</view>
 			<view class="content">
-				<view class="title">系统消息系统消息系统消息</view>
-				<view class="desc">系统消息系统消息系统消息系统消息系统消息系统消息系统消息，系统消息系统消息系统消息系统消息系统消息系统消息系统消息系统消息系统消息系统消息系统消息系统消息，系统消息系统消息系统消息系统消息系统消息</view>
-				<image mode="widthFix" v-if="i == 5" src="@/static/pic.jpg"></image>
+				<view class="title">{{a.noticeTitle}}</view>
+				<view class="desc">{{a.noticeContent}}</view>
+				<!-- <image mode="widthFix" v-if="i == 5" src="@/static/pic.jpg"></image> -->
 			</view>
+		</view>
+		<view class="empty" v-if="total == 0">
+			<image src="@/static/empty.png"></image>
+			<view class="txt">暂无数据</view>
 		</view>
 	</view>
 </template>
@@ -15,16 +19,58 @@
 	export default {
 		data() {
 			return {
-				
+				list: [],
+				total: 1,
+				page: 1
 			};
+		},
+		onLoad() {
+			this.getList();
+		},
+		onReachBottom() {
+			const that = this;
+			uni.showLoading({
+				title: "加载中"
+			})
+			if(that.list.length <= that.total){
+				that.page ++;
+				setTimeout(function() {
+					that.getList(1);
+				}, 1000);
+			}
+		},
+		methods: {
+			toPage(a) {
+				uni.setStorageSync("pcontent",a);
+				uni.navigateTo({
+					url: "/pages/xiaoxi/detail"
+				})
+			},
+			//数组对象去重
+			arrayUnique (arr, name) {
+				var hash = {};
+				return arr.reduce(function (item, next) {
+					hash[next[name]]
+						? ""
+						: (hash[next[name]] = true && item.push(next));
+					return item;
+				}, []);
+			},
+			async getList(type) {
+				const {code,data} = await this.$api.systemNoticeList({
+					userId: uni.getStorageSync("userInfo").id,
+					limit: 20,
+					page: this.page
+				})
+				if(type == 1){
+					uni.hideLoading()
+				}
+				if(code == 200){
+					this.isShow = data.total == 0?true:false;
+					this.list = this.arrayUnique([...this.list,...data.list],"id");
+				}
+			}
 		},
-		methods: {
-			openPage(id){
-				uni.navigateTo({
-					url: "/pages/xiaoxi/detail?id="+id
-				})
-			}
-		}
 	}
 </script>