From f3773d4aa18f3b0814d9720e26fa61b762020eb2 Mon Sep 17 00:00:00 2001
From: hailu <962012470@qq.com>
Date: 星期二, 21 十一月 2023 17:48:34 +0800
Subject: [PATCH] 维修单

---
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/lib.js       |  105 +
 GoldC/pages/notice/notice.js                                                                                                       |  123 +
 GoldC/pages/waterUses/waterUses.wxss                                                                                               |    5 
 GoldC/miniprogram_npm/miniprogram-table-component/index.js.map                                                                     |    1 
 GoldC/pages/notice/notice.wxml                                                                                                     |   15 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.wxml   |   56 
 GoldC/pages/notice/components/page/index.wxml                                                                                      |   17 
 GoldC/node_modules/miniprogram-table-component/tsconfig.json                                                                       |   25 
 GoldC/node_modules/miniprogram-table-component/src/lib.ts                                                                          |    5 
 GoldC/node_modules/miniprogram-table-component/imgs/4.jpg                                                                          |    0 
 GoldC/utils/bmap-wx.js                                                                                                             |   12 
 GoldC/miniprogram_npm/miniprogram-table-component/index.wxml                                                                       |   53 
 GoldC/node_modules/miniprogram-table-component/src/index.json                                                                      |    7 
 GoldC/pages/personSet/personSet.wxml                                                                                               |    3 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/lib.ts                    |    5 
 GoldC/node_modules/miniprogram-table-component/.babelrc                                                                            |   11 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/.babelrc                      |   11 
 GoldC/node_modules/miniprogram-table-component/miniprogram_dist/lib.js.map                                                         |    1 
 GoldC/app.json                                                                                                                     |   10 
 GoldC/pages/person/person.wxss                                                                                                     |    3 
 GoldC/node_modules/miniprogram-table-component/src/index.js                                                                        |   94 
 GoldC/pages/repairTicketDetail/repairTicketDetail.wxss                                                                             |   15 
 GoldC/miniprogram_npm/miniprogram-table-component/lib.js                                                                           |  105 +
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/2.jpg                    |    0 
 GoldC/node_modules/miniprogram-table-component/package.json                                                                        |   73 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/tsconfig.json                 |   25 
 GoldC/pages/notice/components/table/index.json                                                                                     |    4 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.js.map |    1 
 GoldC/pages/devicelogs/devicelogs.wxss                                                                                             |   25 
 GoldC/pages/home/home.wxml                                                                                                         |   15 
 GoldC/node_modules/miniprogram-table-component/imgs/2.jpg                                                                          |    0 
 GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.wxml                                                         |   56 
 GoldC/node_modules/miniprogram-table-component/src/index.wxss                                                                      |   82 
 GoldC/pages/deviceDetails/deviceDetails.js                                                                                         |   14 
 GoldC/miniprogram_npm/miniprogram-table-component/index.wxss                                                                       |   82 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.wxss   |   82 
 GoldC/miniprogram_npm/miniprogram-table-component/index.js                                                                         |  192 ++
 GoldC/pages/notice/notice.wxss                                                                                                     |   15 
 GoldC/pages/repairTicketDetail/repairTicketDetail.js                                                                               |  554 +++--
 GoldC/pages/home/home.js                                                                                                           |  105 +
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/7.jpg                    |    0 
 GoldC/pages/workOrder/workOrder.wxss                                                                                               |  328 +++
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.json   |    7 
 GoldC/pages/reg/reg.wxml                                                                                                           |   27 
 GoldC/pages/personSet/personSet.wxss                                                                                               |    4 
 GoldC/node_modules/miniprogram-table-component/imgs/7.jpg                                                                          |    0 
 GoldC/pages/notice/components/page/index.js                                                                                        |  171 +
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/README.md                     |  215 ++
 GoldC/pages/deviceDetails/deviceDetails.wxml                                                                                       |    8 
 GoldC/pages/person/person.wxml                                                                                                     |    4 
 GoldC/miniprogram_npm/vant-weapp/steps/index.wxml                                                                                  |    3 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/5.jpg                    |    0 
 GoldC/miniprogram_npm/miniprogram-table-component/index.json                                                                       |    7 
 GoldC/pages/devicelogs/devicelogs.wxml                                                                                             |   21 
 GoldC/node_modules/miniprogram-table-component/src/index.wxml                                                                      |   53 
 GoldC/pages/noticeDetail/noticeDetail.js                                                                                           |  104 +
 GoldC/package.json                                                                                                                 |    6 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/1.jpg                    |    0 
 GoldC/pages/noticeDetail/noticeDetail.wxml                                                                                         |   18 
 GoldC/node_modules/miniprogram-table-component/miniprogram_dist/lib.js                                                             |  105 +
 GoldC/node_modules/miniprogram-table-component/imgs/5.jpg                                                                          |    0 
 GoldC/node_modules/.package-lock.json                                                                                              |   18 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/package.json                  |   73 
 GoldC/pages/workOrder/workOrder.wxml                                                                                               |   87 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.js     |  192 ++
 GoldC/pages/reg/reg.js                                                                                                             |  167 +
 GoldC/pages/workOrder/workOrder.js                                                                                                 |  255 ++
 GoldC/pages/notice/components/table/index.wxml                                                                                     |   42 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.wxss                |   82 
 GoldC/node_modules/miniprogram-table-component/gulpfile.js                                                                         |   26 
 GoldC/miniprogram_npm/vant-weapp/tabs/index.wxss                                                                                   |  143 -
 GoldC/pages/scanCode/scanCode.js                                                                                                   |   45 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/3.jpg                    |    0 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/8.jpg                    |    0 
 GoldC/package-lock.json                                                                                                            |   28 
 GoldC/pages/person/person.js                                                                                                       |   23 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.js                  |   94 
 GoldC/pages/notice/notice.json                                                                                                     |   12 
 GoldC/miniprogram_npm/vant-weapp/dialog/index.js                                                                                   |    3 
 GoldC/node_modules/miniprogram-table-component/imgs/3.jpg                                                                          |    0 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.json                |    7 
 GoldC/node_modules/miniprogram-table-component/README.md                                                                           |  215 ++
 GoldC/pages/reg/reg.json                                                                                                           |    5 
 GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.json                                                         |    7 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/LICENSE                       |   21 
 GoldC/pages/login/login.js                                                                                                         |   96 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/gulpfile.js                   |   26 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/6.jpg                    |    0 
 GoldC/pages/noticeDetail/noticeDetail.wxss                                                                                         |   29 
 GoldC/pages/notice/components/page/index.wxss                                                                                      |   84 
 GoldC/pages/notice/components/table/index.wxs                                                                                      |  119 +
 GoldC/pages/notice/components/table/index.js                                                                                       |  109 +
 GoldC/node_modules/miniprogram-table-component/imgs/1.jpg                                                                          |    0 
 GoldC/miniprogram_npm/miniprogram-table-component/lib.js.map                                                                       |    1 
 GoldC/node_modules/miniprogram-table-component/imgs/8.jpg                                                                          |    0 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/lib.js.map   |    1 
 GoldC/pages/notice/components/table/index.wxss                                                                                     |   56 
 GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.js                                                           |  192 ++
 GoldC/pages/notice/components/page/index.json                                                                                      |    4 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.wxml                |   53 
 GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/4.jpg                    |    0 
 GoldC/pages/repairTicketDetail/repairTicketDetail.wxml                                                                             |   35 
 GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.js.map                                                       |    1 
 GoldC/node_modules/miniprogram-table-component/LICENSE                                                                             |   21 
 GoldC/node_modules/miniprogram-table-component/imgs/6.jpg                                                                          |    0 
 GoldC/pages/personSet/personSet.js                                                                                                 |   78 
 GoldC/pages/noticeDetail/noticeDetail.json                                                                                         |    7 
 GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.wxss                                                         |   82 
 GoldC/pages/home/home.wxss                                                                                                         |    4 
 GoldC/pages/scanCode/scanCode.wxml                                                                                                 |    4 
 GoldC/pages/devicelogs/devicelogs.js                                                                                               |   73 
 111 files changed, 5,117 insertions(+), 591 deletions(-)

diff --git a/GoldC/app.json b/GoldC/app.json
index 4744393..e872030 100644
--- a/GoldC/app.json
+++ b/GoldC/app.json
@@ -25,7 +25,9 @@
     "pages/repairTicketDetail/repairTicketDetail",
     "pages/repair/repair",
     "pages/personSet/personSet",
-    "pages/changePsw/changePSW"
+    "pages/changePsw/changePSW",
+    "pages/notice/notice",
+    "pages/noticeDetail/noticeDetail"
   ],
   "permission": {
     "scope.userLocation": {
@@ -66,6 +68,12 @@
       }
     ]
   },
+  "plugins": {
+    "routePlan": {
+      "version": "1.0.19",
+      "provider": "wx50b5593e81dd937a"
+    }
+  },
   "style": "v2",
   "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file
diff --git a/GoldC/miniprogram_npm/miniprogram-table-component/index.js b/GoldC/miniprogram_npm/miniprogram-table-component/index.js
new file mode 100644
index 0000000..04b1229
--- /dev/null
+++ b/GoldC/miniprogram_npm/miniprogram-table-component/index.js
@@ -0,0 +1,192 @@
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Component({
+  /**
+   * 澶栭儴鏍峰紡绫�
+   */
+  externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'],
+
+  /**
+   * 缁勪欢鏍峰紡闅旂
+   */
+  options: {
+    styleIsolation: "isolated",
+    multipleSlots: true // 鏀寔澶氫釜slot
+  },
+
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+    data: {
+      type: Array,
+      value: []
+    },
+    headers: {
+      type: Array,
+      value: []
+    },
+    // table鐨勯珮搴�, 婧㈠嚭鍙粴鍔�
+    height: {
+      type: String,
+      value: 'auto'
+    },
+    width: {
+      type: Number || String,
+      value: '100%'
+    },
+    // 鍗曞厓鏍肩殑瀹藉害
+    tdWidth: {
+      type: Number,
+      value: 35
+    },
+    // 鍥哄畾琛ㄥご thead杈惧埌Header鐨勪綅缃椂灏卞簲璇ヨfixed浜�
+    offsetTop: {
+      type: Number,
+      value: 150
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    stripe: {
+      type: Boolean,
+      value: false
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    border: {
+      type: Boolean,
+      value: false
+    },
+    msg: {
+      type: String,
+      value: '鏆傛棤鏁版嵁~'
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    scrolWidth: '100%'
+  },
+
+  /**
+   * 缁勪欢鐨勭洃鍚睘鎬�
+   */
+  observers: {
+    // 鍦� numberA 鎴栬�� numberB 琚缃椂锛屾墽琛岃繖涓嚱鏁�
+    'headers': function headers(_headers) {
+      var reducer = function reducer(accumulator, currentValue) {
+        return accumulator + Number(currentValue.width);
+      };
+      var scrolWidth = _headers.reduce(reducer, 0);
+
+      this.setData({
+        scrolWidth: scrolWidth
+      });
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勬柟娉曞垪琛�
+   */
+  methods: {
+    onRowClick: function onRowClick(e) {
+      this.triggerEvent('rowClick', e, e.currentTarget.dataset.it);
+    }
+  }
+});
+
+/***/ })
+/******/ ]);
+//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/GoldC/miniprogram_npm/miniprogram-table-component/index.js.map b/GoldC/miniprogram_npm/miniprogram-table-component/index.js.map
new file mode 100644
index 0000000..f50d4f8
--- /dev/null
+++ b/GoldC/miniprogram_npm/miniprogram-table-component/index.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/index.js"],"names":["Component","externalClasses","options","styleIsolation","multipleSlots","properties","data","type","Array","value","headers","height","String","width","Number","tdWidth","offsetTop","stripe","Boolean","border","msg","scrolWidth","observers","reducer","accumulator","currentValue","reduce","setData","methods","onRowClick","e","triggerEvent","currentTarget","dataset","it"],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;AClFAA,UAAU;AACR;;;AAGAC,mBAAiB,CAAC,uBAAD,EAA0B,gBAA1B,EAA4C,iBAA5C,CAJT;;AAMR;;;AAGAC,WAAS;AACPC,oBAAgB,UADT;AAEPC,mBAAe,IAFR,CAEc;AAFd,GATD;;AAcR;;;AAGAC,cAAY;AACVC,UAAM;AACJC,YAAMC,KADF;AAEJC,aAAO;AAFH,KADI;AAKVC,aAAS;AACPH,YAAMC,KADC;AAEPC,aAAO;AAFA,KALC;AASV;AACAE,YAAQ;AACNJ,YAAMK,MADA;AAENH,aAAO;AAFD,KAVE;AAcVI,WAAO;AACLN,YAAMO,UAAUF,MADX;AAELH,aAAO;AAFF,KAdG;AAkBV;AACAM,aAAS;AACPR,YAAMO,MADC;AAEPL,aAAO;AAFA,KAnBC;AAuBV;AACAO,eAAW;AACTT,YAAMO,MADG;AAETL,aAAO;AAFE,KAxBD;AA4BV;AACAQ,YAAQ;AACNV,YAAMW,OADA;AAENT,aAAO;AAFD,KA7BE;AAiCV;AACAU,YAAQ;AACNZ,YAAMW,OADA;AAENT,aAAO;AAFD,KAlCE;AAsCVW,SAAK;AACHb,YAAMK,MADH;AAEHH,aAAO;AAFJ;AAtCK,GAjBJ;;AA6DR;;;AAGAH,QAAM;AACJe,gBAAY;AADR,GAhEE;;AAoER;;;AAGAC,aAAW;AACT;AACA,eAAW,iBAAUZ,QAAV,EAAmB;AAC5B,UAAMa,UAAU,SAAVA,OAAU,CAACC,WAAD,EAAcC,YAAd,EAA+B;AAC7C,eAAOD,cAAcV,OAAOW,aAAaZ,KAApB,CAArB;AACD,OAFD;AAGA,UAAMQ,aAAaX,SAAQgB,MAAR,CAAeH,OAAf,EAAwB,CAAxB,CAAnB;;AAEA,WAAKI,OAAL,CAAa;AACXN,oBAAYA;AADD,OAAb;AAGD;AAXQ,GAvEH;;AAqFR;;;AAGAO,WAAS;AACPC,cADO,sBACIC,CADJ,EACO;AACZ,WAAKC,YAAL,CAAkB,UAAlB,EAA8BD,CAA9B,EAAiCA,EAAEE,aAAF,CAAgBC,OAAhB,CAAwBC,EAAzD;AACD;AAHM;AAxFD,CAAV,E","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 0);\n","Component({\n  /**\n   * 澶栭儴鏍峰紡绫籠n   */\n  externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'], \n\n  /**\n   * 缁勪欢鏍峰紡闅旂\n   */\n  options: {\n    styleIsolation: \"isolated\", \n    multipleSlots: true, // 鏀寔澶氫釜slot\n  },\n\n  /**\n   * 缁勪欢鐨勫睘鎬у垪琛╘n   */\n  properties: {\n    data: {\n      type: Array,\n      value: []\n    },\n    headers: {\n      type: Array,\n      value: []\n    },\n    // table鐨勯珮搴�, 婧㈠嚭鍙粴鍔╘n    height: { \n      type: String,\n      value: 'auto'\n    },\n    width: {\n      type: Number || String,\n      value: '100%'\n    },\n    // 鍗曞厓鏍肩殑瀹藉害\n    tdWidth: {\n      type: Number,\n      value: 35\n    },\n    // 鍥哄畾琛ㄥご thead杈惧埌Header鐨勪綅缃椂灏卞簲璇ヨfixed浜哱n    offsetTop: {\n      type: Number,\n      value: 150\n    },\n    // 鏄惁甯︽湁绾靛悜杈规\n    stripe: {\n      type: Boolean,\n      value: false\n    },\n    // 鏄惁甯︽湁绾靛悜杈规\n    border: {\n      type: Boolean,\n      value: false\n    }, \n    msg: {\n      type: String,\n      value: '鏆傛棤鏁版嵁~'\n    }\n  },\n\n  /**\n   * 缁勪欢鐨勫垵濮嬫暟鎹甛n   */\n  data: {\n    scrolWidth: '100%'\n  },\n\n  /**\n   * 缁勪欢鐨勭洃鍚睘鎬n   */\n  observers: {\n    // 鍦� numberA 鎴栬�� numberB 琚缃椂锛屾墽琛岃繖涓嚱鏁癨n    'headers': function (headers) {\n      const reducer = (accumulator, currentValue) => {\n        return accumulator + Number(currentValue.width)\n      };\n      const scrolWidth = headers.reduce(reducer, 0)\n\n      this.setData({\n        scrolWidth: scrolWidth\n      })\n    }\n  },\n\n  /**\n   * 缁勪欢鐨勬柟娉曞垪琛╘n   */\n  methods: {\n    onRowClick(e) {\n      this.triggerEvent('rowClick', e, e.currentTarget.dataset.it)\n    },\n  }\n})"],"sourceRoot":""}
\ No newline at end of file
diff --git a/GoldC/miniprogram_npm/miniprogram-table-component/index.json b/GoldC/miniprogram_npm/miniprogram-table-component/index.json
new file mode 100644
index 0000000..daecd9b
--- /dev/null
+++ b/GoldC/miniprogram_npm/miniprogram-table-component/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {},
+  "componentGenerics": {
+    "genericsTest": true
+  }
+}
\ No newline at end of file
diff --git a/GoldC/miniprogram_npm/miniprogram-table-component/index.wxml b/GoldC/miniprogram_npm/miniprogram-table-component/index.wxml
new file mode 100644
index 0000000..24816d8
--- /dev/null
+++ b/GoldC/miniprogram_npm/miniprogram-table-component/index.wxml
@@ -0,0 +1,53 @@
+<scroll-view scroll-x="true" style="width:100%;"  class="table table-border">
+    <!-- 琛ㄦ牸澶� start -->
+    <view 
+        class="thead {{ border ? 'thead-border' : ''}} header-row-class-name" 
+        style="width:{{ scrolWidth }}rpx;"
+    >
+      <view 
+        wx:for="{{ headers }}" 
+        wx:key="*this" 
+        class="td" 
+        style="width:{{ item.width }}rpx;"
+      >
+      {{ item.label }}
+      </view>
+    </view>  
+    <!-- 琛ㄦ牸澶� end -->
+    
+    <!-- 琛ㄦ牸浣� start -->
+    <scroll-view 
+        scroll-y="true" 
+        class="tbody"
+        style="width:{{ scrolWidth }}rpx; height:{{ height ? height : 'auto' }};" 
+    >
+      <block 
+        wx:if="{{ data.length > 0 }}" 
+        wx:for-item="it" 
+        wx:for="{{ data }}" 
+        wx:key="*this" 
+        wx:for-index="idx"
+      >
+        <view class="tbody-tr {{ stripe ? 'tbody-tr-stripe' : '' }} {{ border ? 'tbody-tr-border' : ''}} row-class-name">
+          <view wx:for-item="head" 
+            wx:for="{{ headers }}" 
+            wx:key="*this" 
+            class="td cell-class-name" 
+            data-it="{{it}}" 
+            data-row="{{index}}" 
+            data-column="{{idx+1}}"
+            style="width:{{ headers[index].width }}rpx;color:{{ headers[index].color }};" 
+            bindtap="onRowClick"
+          >     
+          {{it[head["prop"]]}}
+          </view>        
+        </view>
+      </block>
+      <!-- 鍒楄〃鏃犳暟鎹鐞� -->
+      <block wx:if="{{ data.length === 0 }}">
+        <view class="no-data">{{ msg }}</view>
+      </block>
+    </scroll-view>
+    <!-- 琛ㄦ牸浣� end -->
+</scroll-view>
+  
diff --git a/GoldC/miniprogram_npm/miniprogram-table-component/index.wxss b/GoldC/miniprogram_npm/miniprogram-table-component/index.wxss
new file mode 100644
index 0000000..f38f79a
--- /dev/null
+++ b/GoldC/miniprogram_npm/miniprogram-table-component/index.wxss
@@ -0,0 +1,82 @@
+.table {
+  position: relative;
+  font-size: 28rpx;
+  background: #fff;  
+  border-right:none;
+  border-radius: 8rpx;  
+  overflow: hidden;
+}
+.thead{
+  border-bottom: none;
+  display: flex;
+  justify-content: flex-start;
+  border-top-right-radius: 8rpx;
+  border-top-left-radius: 8rpx;
+  overflow: visible;
+  color: #909399;
+  border: 1px solid #ebeef5;
+  box-sizing: border-box;
+}
+.thead .td {
+  padding: 20rpx 10rpx;
+  font-weight: bold;
+  display: inline-block;   
+  text-align: center;
+  border-right: 1rpx solid #fff;
+}
+.thead .td:last-child {
+  border-right: none;
+}
+.thead-border .td {
+  border-right: 1rpx solid #ebeef5;
+}
+.thead-border .td:last-child {
+  border-right: none;
+}
+/* .tr{
+  display: flex;
+  white-space:nowrap; 
+} */
+.tbody {
+  box-sizing: border-box;
+  font-size: 28rpx;
+  color: #666;
+  border: 1px solid #ebeef5;
+  border-top: none;
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+.tbody-tr {
+  display: flex;
+  border-bottom: 1px solid #ebeef5;
+}
+.tbody-tr:last-child {
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+
+.tbody-tr-stripe {
+  background: #fff;
+  border-bottom: none;
+}
+.tbody-tr-stripe:nth-child(2n) {
+  background: #F6F6F6;
+}
+.tbody-tr .td {
+  white-space: wrap;
+  padding:20rpx 10rpx;
+  text-align: center;
+}
+
+.tbody-tr-border .td {
+  border-right: 1rpx solid #F6F6F6;
+}
+.tbody-tr-border .td:last-child {  
+  border-right: none;
+}
+.no-data {
+  display: flex;
+  padding: 50rpx;
+  color: #666;
+  justify-content: center;
+}
\ No newline at end of file
diff --git a/GoldC/miniprogram_npm/miniprogram-table-component/lib.js b/GoldC/miniprogram_npm/miniprogram-table-component/lib.js
new file mode 100644
index 0000000..aaaa944
--- /dev/null
+++ b/GoldC/miniprogram_npm/miniprogram-table-component/lib.js
@@ -0,0 +1,105 @@
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */,
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.default = {
+    printf: function printf() {
+        return 'miniprogram-custom-component api demo';
+    }
+};
+
+/***/ })
+/******/ ]);
+//# sourceMappingURL=lib.js.map
\ No newline at end of file
diff --git a/GoldC/miniprogram_npm/miniprogram-table-component/lib.js.map b/GoldC/miniprogram_npm/miniprogram-table-component/lib.js.map
new file mode 100644
index 0000000..92478c6
--- /dev/null
+++ b/GoldC/miniprogram_npm/miniprogram-table-component/lib.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/lib.ts"],"names":[],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;kBClFe;AACb,UADa,oBACP;AACJ,eAAO,uCAAP;AACD;AAHY,C","file":"lib.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 1);\n","export default {\r\n  printf() {\r\n    return 'miniprogram-custom-component api demo'\r\n  }\r\n}\r\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/GoldC/miniprogram_npm/vant-weapp/dialog/index.js b/GoldC/miniprogram_npm/vant-weapp/dialog/index.js
index 8091963..bbbbff2 100644
--- a/GoldC/miniprogram_npm/vant-weapp/dialog/index.js
+++ b/GoldC/miniprogram_npm/vant-weapp/dialog/index.js
@@ -51,9 +51,6 @@
             !show && this.stopLoading();
         }
     },
-    options: {
-      styleIsolation: 'apply-shared'
-    },
     methods: {
         onConfirm() {
             this.handleAction('confirm');
diff --git a/GoldC/miniprogram_npm/vant-weapp/steps/index.wxml b/GoldC/miniprogram_npm/vant-weapp/steps/index.wxml
index 86643a5..508705d 100644
--- a/GoldC/miniprogram_npm/vant-weapp/steps/index.wxml
+++ b/GoldC/miniprogram_npm/vant-weapp/steps/index.wxml
@@ -8,9 +8,8 @@
       class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
     >
       <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
-        <view class="title-steps">{{ item.text }}</view>
+        <view>{{ item.text }}</view>
         <view>{{ item.desc }}</view>
-        <view>{{ item.time }}</view><!-- 鑷娣诲姞鐨� -->
       </view>
       <view class="van-step__circle-container">
         <view class="van-step__circle" wx:if="{{ index !== active }}" style="{{ index < active ? 'background-color: ' + activeColor : '' }}" />
diff --git a/GoldC/miniprogram_npm/vant-weapp/tabs/index.wxss b/GoldC/miniprogram_npm/vant-weapp/tabs/index.wxss
index e58121b..5944afb 100644
--- a/GoldC/miniprogram_npm/vant-weapp/tabs/index.wxss
+++ b/GoldC/miniprogram_npm/vant-weapp/tabs/index.wxss
@@ -1,142 +1 @@
-@import '../common/index.wxss';
-
-.van-tabs {
-  position: relative;
-  -webkit-tap-highlight-color: transparent
-}
-
-.van-tabs__wrap {
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  display: -webkit-flex;
-  display: flex;
-  background-color: #fff
-}
-
-.van-tabs__wrap--page-top {
-  position: fixed
-}
-
-.van-tabs__wrap--content-bottom {
-  top: auto;
-  bottom: 0
-}
-
-.van-tabs__wrap--scrollable .van-tab {
-  -webkit-flex: 0 0 22%;
-  flex: 0 0 22%
-}
-
-.van-tabs__scroll--card {
-  border: 1px solid #f44;
-  border-radius: 2px
-}
-
-.van-tabs__nav {
-  position: relative;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-user-select: none;
-  user-select: none
-}
-
-.van-tabs__nav--line {
-  height: 100%
-}
-
-.van-tabs__nav--card {
-  height: 30px
-}
-
-.van-tabs__nav--card .van-tab {
-  line-height: 30px;
-  color: #f44;
-  border-right: 1px solid #f44
-}
-
-.van-tabs__nav--card .van-tab:last-child {
-  border-right: none
-}
-
-.van-tabs__nav--card .van-tab.van-tab--active {
-  color: #fff;
-  background-color: #f44
-}
-
-.van-tabs__line {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  z-index: 1;
-  height: 3px;
-  background-color: #1E90FF;
-  border-radius: 3px
-}
-
-.van-tabs--line {
-  padding-top: 44px;
-}
-
-.van-tabs--line .van-tabs__wrap {
-  height: 44px
-}
-
-.van-tabs--card {
-  padding-top: 30px;
-  margin: 0 15px
-}
-
-.van-tabs--card .van-tabs__wrap {
-  height: 30px
-}
-
-.van-tabs__content {
-  overflow: hidden
-}
-
-.van-tab,
-.van-tabs__track {
-  position: relative
-}
-
-.van-tab {
-  min-width: 0;
-  padding: 0 5px;
-  font-size: 14px;
-  line-height: 44px;
-  color: #7d7e80;
-  text-align: center;
-  cursor: pointer;
-  box-sizing: border-box;
-  -webkit-flex: 1;
-  flex: 1
-}
-
-.van-tab--active {
-  font-weight: 500;
-  color: #333
-}
-
-.van-tab--disabled {
-  color: #c9c9c9
-}
-
-.van-tab__title--dot:after {
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  vertical-align: middle;
-  background-color: #f44;
-  border-radius: 100%;
-  content: ""
-}
-
-.van-tab__title__info {
-  position: relative !important;
-  top: -1px !important;
-  display: inline-block;
-  -webkit-transform: translateX(0) !important;
-  transform: translateX(0) !important
-}
\ No newline at end of file
+@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{position:absolute;top:0;right:0;left:0;display:-webkit-flex;display:flex;background-color:#fff}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll--card{border:1px solid #f44;border-radius:2px}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{height:30px}.van-tabs__nav--card .van-tab{line-height:30px;color:#f44;border-right:1px solid #f44}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;background-color:#f44}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;background-color:#f44;border-radius:3px}.van-tabs--line{padding-top:44px}.van-tabs--line .van-tabs__wrap{height:44px}.van-tabs--card{padding-top:30px;margin:0 15px}.van-tabs--card .van-tabs__wrap{height:30px}.van-tabs__content{overflow:hidden}.van-tab,.van-tabs__track{position:relative}.van-tab{min-width:0;padding:0 5px;font-size:14px;line-height:44px;color:#7d7e80;text-align:center;cursor:pointer;box-sizing:border-box;-webkit-flex:1;flex:1}.van-tab--active{font-weight:500;color:#333}.van-tab--disabled{color:#c9c9c9}.van-tab__title--dot:after{display:inline-block;width:8px;height:8px;vertical-align:middle;background-color:#f44;border-radius:100%;content:""}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important}
\ No newline at end of file
diff --git a/GoldC/node_modules/.package-lock.json b/GoldC/node_modules/.package-lock.json
new file mode 100644
index 0000000..316ad4a
--- /dev/null
+++ b/GoldC/node_modules/.package-lock.json
@@ -0,0 +1,18 @@
+{
+  "name": "goldc",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "node_modules/miniprogram-table-component": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/miniprogram-table-component/-/miniprogram-table-component-1.1.0.tgz",
+      "integrity": "sha512-TRgo+2ouPqPI42EcXUM/5BndZAueWtk0v2tDmImujYPtmFWiQT/lmgL9TgUFWowfoFM5HsKrLqagIrMKXj9bRw=="
+    },
+    "node_modules/vant-weapp": {
+      "version": "0.5.28",
+      "resolved": "https://registry.npmjs.org/vant-weapp/-/vant-weapp-0.5.28.tgz",
+      "integrity": "sha512-GAJ2PTLuhXHWpAD5B7DdRQdkEFMdjdduuMzKkThUjIiQ63ESnaJvIEUbW3RgiUNNV7PYXwhOFOd6woR/JsTFLA=="
+    }
+  }
+}
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/.babelrc b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/.babelrc
new file mode 100644
index 0000000..0b40319
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/.babelrc
@@ -0,0 +1,11 @@
+{
+    "plugins": [
+        ["module-resolver", {
+            "root": ["./src"],
+            "alias": {}
+        }]
+    ],
+    "presets": [
+        ["env", {"loose": true, "modules": "commonjs"}]
+    ]
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/LICENSE b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/LICENSE
new file mode 100644
index 0000000..e78bcd8
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 wechat-miniprogram
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/README.md b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/README.md
new file mode 100644
index 0000000..0229991
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/README.md
@@ -0,0 +1,215 @@
+# miniprogram-table-component
+
+寰俊灏忕▼搴忚嚜瀹氫箟缁勪欢 - table缁勪欢 - 鏀寔绗笁鏂筺pm鍖呬娇鐢�
+
+> 浣跨敤姝ょ粍浠堕渶瑕佷緷璧栧皬绋嬪簭鍩虹搴� 2.2.2 鐗堟湰锛屽悓鏃朵緷璧栧紑鍙戣�呭伐鍏风殑 npm 鏋勫缓銆傚叿浣撹鎯呭彲鏌ラ槄[瀹樻柟 npm 鏂囨。](https://github.com/wechat-miniprogram/miniprogram-custom-component/blob/master/README.md)銆�
+
+## table缁勪欢
+
+瀹炵幇浜唗able鐨勪互涓嬪姛鑳斤細
+
+- 1.鍩虹琛ㄦ牸
+- 2.甯︽枒椹汗琛ㄦ牸
+- 3.甯﹂棿闅旇竟妗嗚〃鏍�
+- 4.鑷畾涔夋棤鏁版嵁鐨勬彁绀烘枃妗�
+- 5.鑷畾涔夎〃鏍煎ご鏍峰紡
+- 6.鍥哄畾琛ㄥご
+- 7.琛ㄦ牸妯悜婊戝姩
+- 8.鑷畾涔夎〃鏍艰鍜屽崟鍏冩牸鏍峰紡
+- 9.鏌愪竴琛岃鐐瑰嚮鏃朵細瑙﹀彂瀵瑰浜嬩欢
+
+## 蹇�熶笂鎵�
+
+涓�涓畝鏄撶殑寰俊灏忕▼搴� `table缁勪欢`璇炵敓浜嗐�備娇鐢ㄥ緢绠�鍗曪紝灏辨槸鎸夌収npm鍖呭拰寰俊鑷畾缁勪欢鐨勭敤娉曚娇鐢ㄣ��
+
+### 1銆佸畨瑁呭拰寮曞叆
+- 瀹夎缁勪欢锛� 
+```
+npm install --save miniprogram-table-component
+```
+- 寮曞叆table鑷畾涔夌粍浠�
+
+鍦ㄩ〉闈㈢殑 json 閰嶇疆鏂囦欢涓坊鍔� recycle-view 鍜� recycle-item 鑷畾涔夌粍浠剁殑閰嶇疆
+
+```json
+{
+  "usingComponents": {
+    "table-view": "../../../miniprogram_npm/miniprogram-table-component"
+  }
+}
+```
+
+> 娉ㄦ剰锛歯pm鍖呯殑璺緞銆傚鏋滆繖閲岄亣鍒版壘涓嶅埌鍖呯殑闂锛屽彲浠ユ煡鐪嬩笅鏂圭殑 `寰俊灏忕▼搴� npm 鎵惧埌涓嶅埌npm鍖呯殑鍧戯紵`
+
+### 2銆佷娇鐢╰able缁勪欢
+
+鍦╳xml椤甸潰闇�瑕佺敤鍒扮殑鍦版柟浣跨敤锛屽涓嬶細
+
+```html
+<table 
+    headers="{{tableHeader}}" 
+    data="{{ row }}" 
+    stripe="{{ stripe }}"
+    border="{{ border }}"
+/>
+```
+
+鍦╦s椤甸潰闇�瑕佺敤鍒扮殑鍦版柟浣跨敤锛屽涓嬶細
+
+```javascript
+Page({
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    tableHeader: [
+      {
+        prop: 'datetime',
+        width: 150,
+        label: '鏃ユ湡',
+        color: '#55C355'
+      },
+      {
+        prop: 'sign_in',
+        width: 152,
+        label: '涓婄彮鏃堕棿'
+      },
+      {
+        prop: 'sign_out',
+        width: 152,
+        label: '涓嬬彮鏃堕棿'
+      },
+      {
+        prop: 'work_hour',
+        width: 110,
+        label: '宸ユ椂'
+      },
+      {
+        prop: 'statusText',
+        width: 110,
+        label: '鐘舵��'
+      }
+    ],
+    stripe: true,
+    border: true,
+    outBorder: true,
+    row: [
+      {
+          "id": 1,
+          "status": '姝e父',
+          "datetime": "04-01",
+          "sign_in_time": '09:30:00',
+          "sign_out_time": '18:30:00',
+          "work_hour": 8,
+      }, {
+          "id": 2,
+          "status": '杩熷埌',
+          "datetime": "04-02",
+          "sign_in_time": '10:30:00',
+          "sign_out_time": '18:30:00',
+          "work_hour": 7,
+      }, {
+          "id": 29,
+          "status": '姝e父',
+          "datetime": "04-03",
+          "sign_in_time": '09:30:00',
+          "sign_out_time": '18:30:00',
+          "work_hour": 8,
+      }, {
+          "id": 318,
+          "status": '浼戞伅鏃�',
+          "datetime": "04-04",
+          "sign_in_time": '',
+          "sign_out_time": '',
+          "work_hour": '',
+      }, {
+          "id": 319,
+          "status": '姝e父',
+          "datetime": "04-05",
+          "sign_in_time": '09:30:00',
+          "sign_out_time": '18:30:00',
+          "work_hour": 8,
+      }
+    ],
+    msg: '鏆傛棤鏁版嵁'
+  },
+
+  /** 
+   * 鐐瑰嚮琛ㄦ牸涓�琛�
+   */
+  onRowClick: function(e) {
+    console.log('e: ', e)
+  }
+})
+```
+
+
+### 3銆侀厤缃�
+
+閰嶇疆閮ㄥ垎涓昏閰嶇疆杩欎箞鍑犱釜灞炴�э紝鍒嗗埆鏄細
+
+閰嶇疆椤� | 璇存槑 | 绫诲瀷  | 鍙�夊�� | 榛樿鍊� | 蹇呭~
+---|---|---|---|---|---
+headers | 琛ㄦ牸澶撮儴鏍囬銆佸垪瀹藉害銆佸垪灞炴�� | Array | `{prop: 'datetime', width: 150, label: '鏃ユ湡'}` | [] | yes
+data | 琛ㄦ牸鍒楄〃鏁版嵁 | Array | | [] | no
+stripe | 鏄惁涓烘枒椹汗 | boolean | true/false | false | no
+border | 鏄惁鏈夐棿闅旂嚎 | boolean | true/false | false | no
+height | 绾靛悜鍐呭杩囧鏃讹紝鍙�夋嫨璁剧疆楂樺害鍥哄畾琛ㄥご銆� | string |  | auto | no
+msg | 鍥哄畾鏃犳暟鎹儏鍐碉紝灞曠ず鏂囨 | string |  | `鏆傛棤鏁版嵁锝瀈 | no
+header-row-class-name | 鑷畾涔夎〃鏍煎ご鏍峰紡 | string |  |  | no
+row-class-name | 鑷畾涔夎〃鏍艰鏍峰紡 | string |  |  | no
+cell-class-name | 鑷畾涔夊崟鍏冩牸鏍峰紡 | string |  | | no
+bind:rowHandle | 琛岃鐐瑰嚮鏃朵細瑙﹀彂璇ヤ簨浠� | string |  | | no
+
+閰嶇疆鐩稿叧浠g爜馃尠锛�
+
+```javascript
+<table  
+      header-row-class-name="header-class"
+      row-class-name="row-class"
+      cell-class-name="cell-class"
+      headers="{{tableHeader}}" 
+      data="{{ row }}" 
+      stripe="{{ stripe }}"
+      height="{{ height }}"
+      border="{{ border }}"
+      bind:rowClick="onRowClick"
+      bind:cellClick="onCellClick" 
+      no-data-msg="{{ msg }}"
+/> 
+```
+> `header-row-class-name`銆乣row-class-name`銆乣cell-class-name` 鏄�氳繃externalClasses鏀寔澶栭儴鏍峰紡锛屽湪鐖剁粍浠朵腑鎺у埗琛ㄦ牸鐨勬牱寮忥紝[externalClasses澶栭儴鏍峰紡绫�, 瀹樻柟璇存槑](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/wxml-wxss.html)銆備緥瀛愭簮鐮侀�氳繃[github鍦板潃](https://github.com/habc0807/miniprogram-table-component)鏌ョ湅銆�
+
+## 瀹炵幇涓�涓嚜瀹氫箟琛ㄦ牸缁勪欢閬囧埌鐨勫潙
+
+### npm 鐧诲綍涓嶄笂鍜屽彂甯冧笉浜嗙殑闂?
+
+涔嬪墠涔熷彂甯冭繃 npm 鍖咃紝閬楀繕浜� `npm login` 鐧诲綍涓嶄笂闇�瑕佸皢娣樺疂闀滃儚鏀瑰洖npm鐨勩�傝繕鏈変竴鐐归渶瑕佹敞鎰忕殑鏄紝姣忔鍙戝竷閮介渶瑕佹洿鏂� `package.json` 鏂囦欢閲岀殑鐗堟湰鍙枫��
+
+### 寰俊灏忕▼搴� npm 鎵惧埌涓嶅埌npm鍖呯殑鍧戯紵
+
+缁勪欢寮�鍙戝畬锛屽紩鍏ヤ娇鐢ㄧ殑鏃跺�欙紝鍙戠幇npm鐨勫寘锛屾壘涓嶅埌浜嗭紵杩欓噷姣旇緝鍧戠殑鏄皬绋嬪簭鐨刵pm鏈夌壒娈婄殑浣跨敤鏂瑰紡銆�
+
+- 棣栧厛鍦ㄩ」鐩殑鏍圭洰褰曞垵濮嬪寲 npm:
+
+```
+npm init -f 
+```
+- 鐒跺悗瀹夎瀵瑰簲鐨勮嚜瀹氫箟缁勪欢鍖�
+
+```
+npm install -production聽miniprogram-table-component
+```
+> npm/cnpm/yarn add 鍧囧彲
+
+- 鍦ㄥ井淇″紑鍙戣�呭伐鍏蜂腑锛岃缃� 鈥�> 椤圭洰璁剧疆鈥�>聽鍕鹃�変娇鐢╪pm妯″潡銆�
+
+- 鍦ㄥ井淇″紑鍙戣�呭伐鍏蜂腑锛屽伐鍏� 鈥�> 鏋勫缓npm锛屾瀯寤哄畬鎴愪細鐢熸垚 `miniprogram_npm` 鏂囦欢澶癸紝椤圭洰鐢ㄥ埌鐨刵pm鍖呴兘鍦ㄨ繖閲屻��
+- 鎸夌収鑷繁鐨勪娇鐢ㄨ矾寰勶紝浠� `miniprogram_npm` 寮曞叆闇�瑕佺殑鍖呫��
+
+
+## 婧愮爜
+
+- [npm鍦板潃](https://www.npmjs.com/package/miniprogram-table-component)
+- [github鍦板潃](https://github.com/habc0807/miniprogram-table-component)
+
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/gulpfile.js b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/gulpfile.js
new file mode 100644
index 0000000..fb292c2
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/gulpfile.js
@@ -0,0 +1,26 @@
+const gulp = require('gulp')
+const clean = require('gulp-clean')
+
+const config = require('./tools/config')
+const BuildTask = require('./tools/build')
+const id = require('./package.json').name || 'miniprogram-custom-component'
+
+// 鏋勫缓浠诲姟瀹炰緥
+// eslint-disable-next-line no-new
+new BuildTask(id, config.entry)
+
+// 娓呯┖鐢熸垚鐩綍鍜屾枃浠�
+gulp.task('clean', gulp.series(() => gulp.src(config.distPath, {read: false, allowEmpty: true}).pipe(clean()), done => {
+  if (config.isDev) {
+    return gulp.src(config.demoDist, {read: false, allowEmpty: true})
+      .pipe(clean())
+  }
+
+  return done()
+}))
+// 鐩戝惉鏂囦欢鍙樺寲骞惰繘琛屽紑鍙戞ā寮忔瀯寤�
+gulp.task('watch', gulp.series(`${id}-watch`))
+// 寮�鍙戞ā寮忔瀯寤�
+gulp.task('dev', gulp.series(`${id}-dev`))
+// 鐢熶骇妯″紡鏋勫缓
+gulp.task('default', gulp.series(`${id}-default`))
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/1.jpg b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/1.jpg
new file mode 100644
index 0000000..923072a
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/1.jpg
Binary files differ
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/2.jpg b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/2.jpg
new file mode 100644
index 0000000..b0922b7
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/2.jpg
Binary files differ
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/3.jpg b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/3.jpg
new file mode 100644
index 0000000..9b45426
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/3.jpg
Binary files differ
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/4.jpg b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/4.jpg
new file mode 100644
index 0000000..e332043
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/4.jpg
Binary files differ
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/5.jpg b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/5.jpg
new file mode 100644
index 0000000..4f7b410
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/5.jpg
Binary files differ
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/6.jpg b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/6.jpg
new file mode 100644
index 0000000..7117055
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/6.jpg
Binary files differ
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/7.jpg b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/7.jpg
new file mode 100644
index 0000000..9a32763
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/7.jpg
Binary files differ
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/8.jpg b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/8.jpg
new file mode 100644
index 0000000..37dd5cb
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/imgs/8.jpg
Binary files differ
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.js b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.js
new file mode 100644
index 0000000..04b1229
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.js
@@ -0,0 +1,192 @@
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Component({
+  /**
+   * 澶栭儴鏍峰紡绫�
+   */
+  externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'],
+
+  /**
+   * 缁勪欢鏍峰紡闅旂
+   */
+  options: {
+    styleIsolation: "isolated",
+    multipleSlots: true // 鏀寔澶氫釜slot
+  },
+
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+    data: {
+      type: Array,
+      value: []
+    },
+    headers: {
+      type: Array,
+      value: []
+    },
+    // table鐨勯珮搴�, 婧㈠嚭鍙粴鍔�
+    height: {
+      type: String,
+      value: 'auto'
+    },
+    width: {
+      type: Number || String,
+      value: '100%'
+    },
+    // 鍗曞厓鏍肩殑瀹藉害
+    tdWidth: {
+      type: Number,
+      value: 35
+    },
+    // 鍥哄畾琛ㄥご thead杈惧埌Header鐨勪綅缃椂灏卞簲璇ヨfixed浜�
+    offsetTop: {
+      type: Number,
+      value: 150
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    stripe: {
+      type: Boolean,
+      value: false
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    border: {
+      type: Boolean,
+      value: false
+    },
+    msg: {
+      type: String,
+      value: '鏆傛棤鏁版嵁~'
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    scrolWidth: '100%'
+  },
+
+  /**
+   * 缁勪欢鐨勭洃鍚睘鎬�
+   */
+  observers: {
+    // 鍦� numberA 鎴栬�� numberB 琚缃椂锛屾墽琛岃繖涓嚱鏁�
+    'headers': function headers(_headers) {
+      var reducer = function reducer(accumulator, currentValue) {
+        return accumulator + Number(currentValue.width);
+      };
+      var scrolWidth = _headers.reduce(reducer, 0);
+
+      this.setData({
+        scrolWidth: scrolWidth
+      });
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勬柟娉曞垪琛�
+   */
+  methods: {
+    onRowClick: function onRowClick(e) {
+      this.triggerEvent('rowClick', e, e.currentTarget.dataset.it);
+    }
+  }
+});
+
+/***/ })
+/******/ ]);
+//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.js.map b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.js.map
new file mode 100644
index 0000000..f50d4f8
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/index.js"],"names":["Component","externalClasses","options","styleIsolation","multipleSlots","properties","data","type","Array","value","headers","height","String","width","Number","tdWidth","offsetTop","stripe","Boolean","border","msg","scrolWidth","observers","reducer","accumulator","currentValue","reduce","setData","methods","onRowClick","e","triggerEvent","currentTarget","dataset","it"],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;AClFAA,UAAU;AACR;;;AAGAC,mBAAiB,CAAC,uBAAD,EAA0B,gBAA1B,EAA4C,iBAA5C,CAJT;;AAMR;;;AAGAC,WAAS;AACPC,oBAAgB,UADT;AAEPC,mBAAe,IAFR,CAEc;AAFd,GATD;;AAcR;;;AAGAC,cAAY;AACVC,UAAM;AACJC,YAAMC,KADF;AAEJC,aAAO;AAFH,KADI;AAKVC,aAAS;AACPH,YAAMC,KADC;AAEPC,aAAO;AAFA,KALC;AASV;AACAE,YAAQ;AACNJ,YAAMK,MADA;AAENH,aAAO;AAFD,KAVE;AAcVI,WAAO;AACLN,YAAMO,UAAUF,MADX;AAELH,aAAO;AAFF,KAdG;AAkBV;AACAM,aAAS;AACPR,YAAMO,MADC;AAEPL,aAAO;AAFA,KAnBC;AAuBV;AACAO,eAAW;AACTT,YAAMO,MADG;AAETL,aAAO;AAFE,KAxBD;AA4BV;AACAQ,YAAQ;AACNV,YAAMW,OADA;AAENT,aAAO;AAFD,KA7BE;AAiCV;AACAU,YAAQ;AACNZ,YAAMW,OADA;AAENT,aAAO;AAFD,KAlCE;AAsCVW,SAAK;AACHb,YAAMK,MADH;AAEHH,aAAO;AAFJ;AAtCK,GAjBJ;;AA6DR;;;AAGAH,QAAM;AACJe,gBAAY;AADR,GAhEE;;AAoER;;;AAGAC,aAAW;AACT;AACA,eAAW,iBAAUZ,QAAV,EAAmB;AAC5B,UAAMa,UAAU,SAAVA,OAAU,CAACC,WAAD,EAAcC,YAAd,EAA+B;AAC7C,eAAOD,cAAcV,OAAOW,aAAaZ,KAApB,CAArB;AACD,OAFD;AAGA,UAAMQ,aAAaX,SAAQgB,MAAR,CAAeH,OAAf,EAAwB,CAAxB,CAAnB;;AAEA,WAAKI,OAAL,CAAa;AACXN,oBAAYA;AADD,OAAb;AAGD;AAXQ,GAvEH;;AAqFR;;;AAGAO,WAAS;AACPC,cADO,sBACIC,CADJ,EACO;AACZ,WAAKC,YAAL,CAAkB,UAAlB,EAA8BD,CAA9B,EAAiCA,EAAEE,aAAF,CAAgBC,OAAhB,CAAwBC,EAAzD;AACD;AAHM;AAxFD,CAAV,E","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 0);\n","Component({\n  /**\n   * 澶栭儴鏍峰紡绫籠n   */\n  externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'], \n\n  /**\n   * 缁勪欢鏍峰紡闅旂\n   */\n  options: {\n    styleIsolation: \"isolated\", \n    multipleSlots: true, // 鏀寔澶氫釜slot\n  },\n\n  /**\n   * 缁勪欢鐨勫睘鎬у垪琛╘n   */\n  properties: {\n    data: {\n      type: Array,\n      value: []\n    },\n    headers: {\n      type: Array,\n      value: []\n    },\n    // table鐨勯珮搴�, 婧㈠嚭鍙粴鍔╘n    height: { \n      type: String,\n      value: 'auto'\n    },\n    width: {\n      type: Number || String,\n      value: '100%'\n    },\n    // 鍗曞厓鏍肩殑瀹藉害\n    tdWidth: {\n      type: Number,\n      value: 35\n    },\n    // 鍥哄畾琛ㄥご thead杈惧埌Header鐨勪綅缃椂灏卞簲璇ヨfixed浜哱n    offsetTop: {\n      type: Number,\n      value: 150\n    },\n    // 鏄惁甯︽湁绾靛悜杈规\n    stripe: {\n      type: Boolean,\n      value: false\n    },\n    // 鏄惁甯︽湁绾靛悜杈规\n    border: {\n      type: Boolean,\n      value: false\n    }, \n    msg: {\n      type: String,\n      value: '鏆傛棤鏁版嵁~'\n    }\n  },\n\n  /**\n   * 缁勪欢鐨勫垵濮嬫暟鎹甛n   */\n  data: {\n    scrolWidth: '100%'\n  },\n\n  /**\n   * 缁勪欢鐨勭洃鍚睘鎬n   */\n  observers: {\n    // 鍦� numberA 鎴栬�� numberB 琚缃椂锛屾墽琛岃繖涓嚱鏁癨n    'headers': function (headers) {\n      const reducer = (accumulator, currentValue) => {\n        return accumulator + Number(currentValue.width)\n      };\n      const scrolWidth = headers.reduce(reducer, 0)\n\n      this.setData({\n        scrolWidth: scrolWidth\n      })\n    }\n  },\n\n  /**\n   * 缁勪欢鐨勬柟娉曞垪琛╘n   */\n  methods: {\n    onRowClick(e) {\n      this.triggerEvent('rowClick', e, e.currentTarget.dataset.it)\n    },\n  }\n})"],"sourceRoot":""}
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.json b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.json
new file mode 100644
index 0000000..daecd9b
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {},
+  "componentGenerics": {
+    "genericsTest": true
+  }
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.wxml b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.wxml
new file mode 100644
index 0000000..9fd4cb3
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.wxml
@@ -0,0 +1,56 @@
+<scroll-view scroll-x="true" style="width:100%;"  class="table table-border">
+    <!-- 琛ㄦ牸澶� start -->
+    <view 
+        class="thead {{ border ? 'thead-border' : ''}} header-row-class-name" 
+        style="width:{{ scrolWidth }}rpx;"
+    >
+      <view 
+        wx:for="{{ headers }}" 
+        wx:key="*this" 
+        class="td" 
+        style="width:{{ item.width }}rpx;"
+      >
+      {{ item.label }}
+      </view>
+    </view>  
+    <!-- 琛ㄦ牸澶� end -->
+    
+    <!-- 琛ㄦ牸浣� start -->
+    <scroll-view 
+        scroll-y="true" 
+        class="tbody"
+        style="width:{{ scrolWidth }}rpx; height:{{ height ? height : 'auto' }};" 
+    >
+      <block 
+        wx:if="{{ data.length > 0 }}" 
+        wx:for-item="it" 
+        wx:for="{{ data }}" 
+        wx:key="*this" 
+        wx:for-index="idx"
+      >
+        <view class="tbody-tr {{ stripe ? 'tbody-tr-stripe' : '' }} {{ border ? 'tbody-tr-border' : ''}} row-class-name">
+          <view wx:for-item="head" 
+            wx:for="{{ headers }}" 
+            wx:key="*this" 
+            class="td cell-class-name" 
+            data-it="{{it}}" 
+            data-row="{{index}}" 
+            data-column="{{idx+1}}"
+            style="width:{{ headers[index].width }}rpx;color:{{ headers[index].color }};" 
+            bindtap="onRowClick"
+            bind:cellClick="onCellClick" 
+          >     
+          {{it[head["prop"]]}}
+          </view>
+          <!-- <slot name="action"></slot>         -->
+        </view>
+       
+      </block>
+      <!-- 鍒楄〃鏃犳暟鎹鐞� -->
+      <block wx:if="{{ data.length === 0 }}">
+        <view class="no-data">{{ msg }}</view>
+      </block>
+    </scroll-view>
+    <!-- 琛ㄦ牸浣� end -->
+</scroll-view>
+  
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.wxss b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.wxss
new file mode 100644
index 0000000..f38f79a
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/index.wxss
@@ -0,0 +1,82 @@
+.table {
+  position: relative;
+  font-size: 28rpx;
+  background: #fff;  
+  border-right:none;
+  border-radius: 8rpx;  
+  overflow: hidden;
+}
+.thead{
+  border-bottom: none;
+  display: flex;
+  justify-content: flex-start;
+  border-top-right-radius: 8rpx;
+  border-top-left-radius: 8rpx;
+  overflow: visible;
+  color: #909399;
+  border: 1px solid #ebeef5;
+  box-sizing: border-box;
+}
+.thead .td {
+  padding: 20rpx 10rpx;
+  font-weight: bold;
+  display: inline-block;   
+  text-align: center;
+  border-right: 1rpx solid #fff;
+}
+.thead .td:last-child {
+  border-right: none;
+}
+.thead-border .td {
+  border-right: 1rpx solid #ebeef5;
+}
+.thead-border .td:last-child {
+  border-right: none;
+}
+/* .tr{
+  display: flex;
+  white-space:nowrap; 
+} */
+.tbody {
+  box-sizing: border-box;
+  font-size: 28rpx;
+  color: #666;
+  border: 1px solid #ebeef5;
+  border-top: none;
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+.tbody-tr {
+  display: flex;
+  border-bottom: 1px solid #ebeef5;
+}
+.tbody-tr:last-child {
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+
+.tbody-tr-stripe {
+  background: #fff;
+  border-bottom: none;
+}
+.tbody-tr-stripe:nth-child(2n) {
+  background: #F6F6F6;
+}
+.tbody-tr .td {
+  white-space: wrap;
+  padding:20rpx 10rpx;
+  text-align: center;
+}
+
+.tbody-tr-border .td {
+  border-right: 1rpx solid #F6F6F6;
+}
+.tbody-tr-border .td:last-child {  
+  border-right: none;
+}
+.no-data {
+  display: flex;
+  padding: 50rpx;
+  color: #666;
+  justify-content: center;
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/lib.js b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/lib.js
new file mode 100644
index 0000000..aaaa944
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/lib.js
@@ -0,0 +1,105 @@
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */,
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.default = {
+    printf: function printf() {
+        return 'miniprogram-custom-component api demo';
+    }
+};
+
+/***/ })
+/******/ ]);
+//# sourceMappingURL=lib.js.map
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/lib.js.map b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/lib.js.map
new file mode 100644
index 0000000..92478c6
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/miniprogram_dist/lib.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/lib.ts"],"names":[],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;kBClFe;AACb,UADa,oBACP;AACJ,eAAO,uCAAP;AACD;AAHY,C","file":"lib.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 1);\n","export default {\r\n  printf() {\r\n    return 'miniprogram-custom-component api demo'\r\n  }\r\n}\r\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/package.json b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/package.json
new file mode 100644
index 0000000..a23ed3f
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/package.json
@@ -0,0 +1,73 @@
+{
+  "name": "miniprogram-table-component",
+  "version": "1.1.0",
+  "description": "",
+  "main": "miniprogram_dist/index.js",
+  "scripts": {
+    "dev": "gulp dev --develop",
+    "watch": "gulp watch --develop --watch",
+    "build": "gulp",
+    "dist": "npm run build",
+    "clean-dev": "gulp clean --develop",
+    "clean": "gulp clean",
+    "test": "jest --bail",
+    "test-debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --bail",
+    "coverage": "jest ./test/* --coverage --bail",
+    "lint": "eslint \"src/**/*.js\" --fix",
+    "lint-tools": "eslint \"tools/**/*.js\" --rule \"import/no-extraneous-dependencies: false\" --fix"
+  },
+  "miniprogram": "miniprogram_dist",
+  "jest": {
+    "testEnvironment": "jsdom",
+    "testURL": "https://jest.test",
+    "collectCoverageFrom": [
+      "miniprogram_dist/**/*.js"
+    ],
+    "moduleDirectories": [
+      "node_modules",
+      "miniprogram_dist"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/habc0807/miniprogram-table-component"
+  },
+  "author": "wechat-miniprogram",
+  "license": "MIT",
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^2.28.0",
+    "@typescript-eslint/parser": "^2.28.0",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
+    "babel-plugin-module-resolver": "^3.2.0",
+    "babel-preset-env": "^1.7.0",
+    "colors": "^1.3.1",
+    "eslint": "^5.14.1",
+    "eslint-config-airbnb-base": "13.1.0",
+    "eslint-loader": "^2.1.2",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-node": "^7.0.1",
+    "eslint-plugin-promise": "^3.8.0",
+    "gulp": "^4.0.0",
+    "gulp-clean": "^0.4.0",
+    "gulp-if": "^2.0.2",
+    "gulp-install": "^1.1.0",
+    "gulp-less": "^4.0.1",
+    "gulp-rename": "^1.4.0",
+    "gulp-sourcemaps": "^2.6.5",
+    "jest": "^23.5.0",
+    "miniprogram-api-typings": "^2.10.3-1",
+    "miniprogram-simulate": "^1.2.0",
+    "thread-loader": "^2.1.3",
+    "through2": "^2.0.3",
+    "ts-loader": "^7.0.0",
+    "typescript": "^3.8.3",
+    "vinyl": "^2.2.0",
+    "webpack": "^4.29.5",
+    "webpack-node-externals": "^1.7.2"
+  },
+  "dependencies": {},
+  "__npminstall_done": true,
+  "_from": "miniprogram-table-component@1.1.0",
+  "_resolved": "https://registry.npmmirror.com/miniprogram-table-component/-/miniprogram-table-component-1.1.0.tgz"
+}
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.js b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.js
new file mode 100644
index 0000000..4c89b36
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.js
@@ -0,0 +1,94 @@
+Component({
+  /**
+   * 澶栭儴鏍峰紡绫�
+   */
+  externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'], 
+
+  /**
+   * 缁勪欢鏍峰紡闅旂
+   */
+  options: {
+    styleIsolation: "isolated", 
+    multipleSlots: true, // 鏀寔澶氫釜slot
+  },
+
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+    data: {
+      type: Array,
+      value: []
+    },
+    headers: {
+      type: Array,
+      value: []
+    },
+    // table鐨勯珮搴�, 婧㈠嚭鍙粴鍔�
+    height: { 
+      type: String,
+      value: 'auto'
+    },
+    width: {
+      type: Number || String,
+      value: '100%'
+    },
+    // 鍗曞厓鏍肩殑瀹藉害
+    tdWidth: {
+      type: Number,
+      value: 35
+    },
+    // 鍥哄畾琛ㄥご thead杈惧埌Header鐨勪綅缃椂灏卞簲璇ヨfixed浜�
+    offsetTop: {
+      type: Number,
+      value: 150
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    stripe: {
+      type: Boolean,
+      value: false
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    border: {
+      type: Boolean,
+      value: false
+    }, 
+    msg: {
+      type: String,
+      value: '鏆傛棤鏁版嵁~'
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    scrolWidth: '100%'
+  },
+
+  /**
+   * 缁勪欢鐨勭洃鍚睘鎬�
+   */
+  observers: {
+    // 鍦� numberA 鎴栬�� numberB 琚缃椂锛屾墽琛岃繖涓嚱鏁�
+    'headers': function (headers) {
+      const reducer = (accumulator, currentValue) => {
+        return accumulator + Number(currentValue.width)
+      };
+      const scrolWidth = headers.reduce(reducer, 0)
+
+      this.setData({
+        scrolWidth: scrolWidth
+      })
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勬柟娉曞垪琛�
+   */
+  methods: {
+    onRowClick(e) {
+      this.triggerEvent('rowClick', e, e.currentTarget.dataset.it)
+    },
+  }
+})
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.json b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.json
new file mode 100644
index 0000000..daecd9b
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {},
+  "componentGenerics": {
+    "genericsTest": true
+  }
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.wxml b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.wxml
new file mode 100644
index 0000000..24816d8
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.wxml
@@ -0,0 +1,53 @@
+<scroll-view scroll-x="true" style="width:100%;"  class="table table-border">
+    <!-- 琛ㄦ牸澶� start -->
+    <view 
+        class="thead {{ border ? 'thead-border' : ''}} header-row-class-name" 
+        style="width:{{ scrolWidth }}rpx;"
+    >
+      <view 
+        wx:for="{{ headers }}" 
+        wx:key="*this" 
+        class="td" 
+        style="width:{{ item.width }}rpx;"
+      >
+      {{ item.label }}
+      </view>
+    </view>  
+    <!-- 琛ㄦ牸澶� end -->
+    
+    <!-- 琛ㄦ牸浣� start -->
+    <scroll-view 
+        scroll-y="true" 
+        class="tbody"
+        style="width:{{ scrolWidth }}rpx; height:{{ height ? height : 'auto' }};" 
+    >
+      <block 
+        wx:if="{{ data.length > 0 }}" 
+        wx:for-item="it" 
+        wx:for="{{ data }}" 
+        wx:key="*this" 
+        wx:for-index="idx"
+      >
+        <view class="tbody-tr {{ stripe ? 'tbody-tr-stripe' : '' }} {{ border ? 'tbody-tr-border' : ''}} row-class-name">
+          <view wx:for-item="head" 
+            wx:for="{{ headers }}" 
+            wx:key="*this" 
+            class="td cell-class-name" 
+            data-it="{{it}}" 
+            data-row="{{index}}" 
+            data-column="{{idx+1}}"
+            style="width:{{ headers[index].width }}rpx;color:{{ headers[index].color }};" 
+            bindtap="onRowClick"
+          >     
+          {{it[head["prop"]]}}
+          </view>        
+        </view>
+      </block>
+      <!-- 鍒楄〃鏃犳暟鎹鐞� -->
+      <block wx:if="{{ data.length === 0 }}">
+        <view class="no-data">{{ msg }}</view>
+      </block>
+    </scroll-view>
+    <!-- 琛ㄦ牸浣� end -->
+</scroll-view>
+  
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.wxss b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.wxss
new file mode 100644
index 0000000..f38f79a
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/index.wxss
@@ -0,0 +1,82 @@
+.table {
+  position: relative;
+  font-size: 28rpx;
+  background: #fff;  
+  border-right:none;
+  border-radius: 8rpx;  
+  overflow: hidden;
+}
+.thead{
+  border-bottom: none;
+  display: flex;
+  justify-content: flex-start;
+  border-top-right-radius: 8rpx;
+  border-top-left-radius: 8rpx;
+  overflow: visible;
+  color: #909399;
+  border: 1px solid #ebeef5;
+  box-sizing: border-box;
+}
+.thead .td {
+  padding: 20rpx 10rpx;
+  font-weight: bold;
+  display: inline-block;   
+  text-align: center;
+  border-right: 1rpx solid #fff;
+}
+.thead .td:last-child {
+  border-right: none;
+}
+.thead-border .td {
+  border-right: 1rpx solid #ebeef5;
+}
+.thead-border .td:last-child {
+  border-right: none;
+}
+/* .tr{
+  display: flex;
+  white-space:nowrap; 
+} */
+.tbody {
+  box-sizing: border-box;
+  font-size: 28rpx;
+  color: #666;
+  border: 1px solid #ebeef5;
+  border-top: none;
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+.tbody-tr {
+  display: flex;
+  border-bottom: 1px solid #ebeef5;
+}
+.tbody-tr:last-child {
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+
+.tbody-tr-stripe {
+  background: #fff;
+  border-bottom: none;
+}
+.tbody-tr-stripe:nth-child(2n) {
+  background: #F6F6F6;
+}
+.tbody-tr .td {
+  white-space: wrap;
+  padding:20rpx 10rpx;
+  text-align: center;
+}
+
+.tbody-tr-border .td {
+  border-right: 1rpx solid #F6F6F6;
+}
+.tbody-tr-border .td:last-child {  
+  border-right: none;
+}
+.no-data {
+  display: flex;
+  padding: 50rpx;
+  color: #666;
+  justify-content: center;
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/lib.ts b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/lib.ts
new file mode 100644
index 0000000..20d0c43
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/src/lib.ts
@@ -0,0 +1,5 @@
+export default {
+  printf() {
+    return 'miniprogram-custom-component api demo'
+  }
+}
diff --git a/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/tsconfig.json b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/tsconfig.json
new file mode 100644
index 0000000..bfea1f2
--- /dev/null
+++ b/GoldC/node_modules/.store/miniprogram-table-component@1.1.0/node_modules/miniprogram-table-component/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "module": "esnext",
+    "target": "es2015",
+    "lib": ["es2015", "es2017", "dom"],
+    "noImplicitAny": false,
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "baseUrl": ".",
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata":true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true
+  },
+  "files": [
+    "node_modules/miniprogram-api-typings/index.d.ts"
+  ],
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
diff --git a/GoldC/node_modules/miniprogram-table-component/.babelrc b/GoldC/node_modules/miniprogram-table-component/.babelrc
new file mode 100644
index 0000000..0b40319
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/.babelrc
@@ -0,0 +1,11 @@
+{
+    "plugins": [
+        ["module-resolver", {
+            "root": ["./src"],
+            "alias": {}
+        }]
+    ],
+    "presets": [
+        ["env", {"loose": true, "modules": "commonjs"}]
+    ]
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/LICENSE b/GoldC/node_modules/miniprogram-table-component/LICENSE
new file mode 100644
index 0000000..e78bcd8
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 wechat-miniprogram
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/GoldC/node_modules/miniprogram-table-component/README.md b/GoldC/node_modules/miniprogram-table-component/README.md
new file mode 100644
index 0000000..0229991
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/README.md
@@ -0,0 +1,215 @@
+# miniprogram-table-component
+
+寰俊灏忕▼搴忚嚜瀹氫箟缁勪欢 - table缁勪欢 - 鏀寔绗笁鏂筺pm鍖呬娇鐢�
+
+> 浣跨敤姝ょ粍浠堕渶瑕佷緷璧栧皬绋嬪簭鍩虹搴� 2.2.2 鐗堟湰锛屽悓鏃朵緷璧栧紑鍙戣�呭伐鍏风殑 npm 鏋勫缓銆傚叿浣撹鎯呭彲鏌ラ槄[瀹樻柟 npm 鏂囨。](https://github.com/wechat-miniprogram/miniprogram-custom-component/blob/master/README.md)銆�
+
+## table缁勪欢
+
+瀹炵幇浜唗able鐨勪互涓嬪姛鑳斤細
+
+- 1.鍩虹琛ㄦ牸
+- 2.甯︽枒椹汗琛ㄦ牸
+- 3.甯﹂棿闅旇竟妗嗚〃鏍�
+- 4.鑷畾涔夋棤鏁版嵁鐨勬彁绀烘枃妗�
+- 5.鑷畾涔夎〃鏍煎ご鏍峰紡
+- 6.鍥哄畾琛ㄥご
+- 7.琛ㄦ牸妯悜婊戝姩
+- 8.鑷畾涔夎〃鏍艰鍜屽崟鍏冩牸鏍峰紡
+- 9.鏌愪竴琛岃鐐瑰嚮鏃朵細瑙﹀彂瀵瑰浜嬩欢
+
+## 蹇�熶笂鎵�
+
+涓�涓畝鏄撶殑寰俊灏忕▼搴� `table缁勪欢`璇炵敓浜嗐�備娇鐢ㄥ緢绠�鍗曪紝灏辨槸鎸夌収npm鍖呭拰寰俊鑷畾缁勪欢鐨勭敤娉曚娇鐢ㄣ��
+
+### 1銆佸畨瑁呭拰寮曞叆
+- 瀹夎缁勪欢锛� 
+```
+npm install --save miniprogram-table-component
+```
+- 寮曞叆table鑷畾涔夌粍浠�
+
+鍦ㄩ〉闈㈢殑 json 閰嶇疆鏂囦欢涓坊鍔� recycle-view 鍜� recycle-item 鑷畾涔夌粍浠剁殑閰嶇疆
+
+```json
+{
+  "usingComponents": {
+    "table-view": "../../../miniprogram_npm/miniprogram-table-component"
+  }
+}
+```
+
+> 娉ㄦ剰锛歯pm鍖呯殑璺緞銆傚鏋滆繖閲岄亣鍒版壘涓嶅埌鍖呯殑闂锛屽彲浠ユ煡鐪嬩笅鏂圭殑 `寰俊灏忕▼搴� npm 鎵惧埌涓嶅埌npm鍖呯殑鍧戯紵`
+
+### 2銆佷娇鐢╰able缁勪欢
+
+鍦╳xml椤甸潰闇�瑕佺敤鍒扮殑鍦版柟浣跨敤锛屽涓嬶細
+
+```html
+<table 
+    headers="{{tableHeader}}" 
+    data="{{ row }}" 
+    stripe="{{ stripe }}"
+    border="{{ border }}"
+/>
+```
+
+鍦╦s椤甸潰闇�瑕佺敤鍒扮殑鍦版柟浣跨敤锛屽涓嬶細
+
+```javascript
+Page({
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    tableHeader: [
+      {
+        prop: 'datetime',
+        width: 150,
+        label: '鏃ユ湡',
+        color: '#55C355'
+      },
+      {
+        prop: 'sign_in',
+        width: 152,
+        label: '涓婄彮鏃堕棿'
+      },
+      {
+        prop: 'sign_out',
+        width: 152,
+        label: '涓嬬彮鏃堕棿'
+      },
+      {
+        prop: 'work_hour',
+        width: 110,
+        label: '宸ユ椂'
+      },
+      {
+        prop: 'statusText',
+        width: 110,
+        label: '鐘舵��'
+      }
+    ],
+    stripe: true,
+    border: true,
+    outBorder: true,
+    row: [
+      {
+          "id": 1,
+          "status": '姝e父',
+          "datetime": "04-01",
+          "sign_in_time": '09:30:00',
+          "sign_out_time": '18:30:00',
+          "work_hour": 8,
+      }, {
+          "id": 2,
+          "status": '杩熷埌',
+          "datetime": "04-02",
+          "sign_in_time": '10:30:00',
+          "sign_out_time": '18:30:00',
+          "work_hour": 7,
+      }, {
+          "id": 29,
+          "status": '姝e父',
+          "datetime": "04-03",
+          "sign_in_time": '09:30:00',
+          "sign_out_time": '18:30:00',
+          "work_hour": 8,
+      }, {
+          "id": 318,
+          "status": '浼戞伅鏃�',
+          "datetime": "04-04",
+          "sign_in_time": '',
+          "sign_out_time": '',
+          "work_hour": '',
+      }, {
+          "id": 319,
+          "status": '姝e父',
+          "datetime": "04-05",
+          "sign_in_time": '09:30:00',
+          "sign_out_time": '18:30:00',
+          "work_hour": 8,
+      }
+    ],
+    msg: '鏆傛棤鏁版嵁'
+  },
+
+  /** 
+   * 鐐瑰嚮琛ㄦ牸涓�琛�
+   */
+  onRowClick: function(e) {
+    console.log('e: ', e)
+  }
+})
+```
+
+
+### 3銆侀厤缃�
+
+閰嶇疆閮ㄥ垎涓昏閰嶇疆杩欎箞鍑犱釜灞炴�э紝鍒嗗埆鏄細
+
+閰嶇疆椤� | 璇存槑 | 绫诲瀷  | 鍙�夊�� | 榛樿鍊� | 蹇呭~
+---|---|---|---|---|---
+headers | 琛ㄦ牸澶撮儴鏍囬銆佸垪瀹藉害銆佸垪灞炴�� | Array | `{prop: 'datetime', width: 150, label: '鏃ユ湡'}` | [] | yes
+data | 琛ㄦ牸鍒楄〃鏁版嵁 | Array | | [] | no
+stripe | 鏄惁涓烘枒椹汗 | boolean | true/false | false | no
+border | 鏄惁鏈夐棿闅旂嚎 | boolean | true/false | false | no
+height | 绾靛悜鍐呭杩囧鏃讹紝鍙�夋嫨璁剧疆楂樺害鍥哄畾琛ㄥご銆� | string |  | auto | no
+msg | 鍥哄畾鏃犳暟鎹儏鍐碉紝灞曠ず鏂囨 | string |  | `鏆傛棤鏁版嵁锝瀈 | no
+header-row-class-name | 鑷畾涔夎〃鏍煎ご鏍峰紡 | string |  |  | no
+row-class-name | 鑷畾涔夎〃鏍艰鏍峰紡 | string |  |  | no
+cell-class-name | 鑷畾涔夊崟鍏冩牸鏍峰紡 | string |  | | no
+bind:rowHandle | 琛岃鐐瑰嚮鏃朵細瑙﹀彂璇ヤ簨浠� | string |  | | no
+
+閰嶇疆鐩稿叧浠g爜馃尠锛�
+
+```javascript
+<table  
+      header-row-class-name="header-class"
+      row-class-name="row-class"
+      cell-class-name="cell-class"
+      headers="{{tableHeader}}" 
+      data="{{ row }}" 
+      stripe="{{ stripe }}"
+      height="{{ height }}"
+      border="{{ border }}"
+      bind:rowClick="onRowClick"
+      bind:cellClick="onCellClick" 
+      no-data-msg="{{ msg }}"
+/> 
+```
+> `header-row-class-name`銆乣row-class-name`銆乣cell-class-name` 鏄�氳繃externalClasses鏀寔澶栭儴鏍峰紡锛屽湪鐖剁粍浠朵腑鎺у埗琛ㄦ牸鐨勬牱寮忥紝[externalClasses澶栭儴鏍峰紡绫�, 瀹樻柟璇存槑](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/wxml-wxss.html)銆備緥瀛愭簮鐮侀�氳繃[github鍦板潃](https://github.com/habc0807/miniprogram-table-component)鏌ョ湅銆�
+
+## 瀹炵幇涓�涓嚜瀹氫箟琛ㄦ牸缁勪欢閬囧埌鐨勫潙
+
+### npm 鐧诲綍涓嶄笂鍜屽彂甯冧笉浜嗙殑闂?
+
+涔嬪墠涔熷彂甯冭繃 npm 鍖咃紝閬楀繕浜� `npm login` 鐧诲綍涓嶄笂闇�瑕佸皢娣樺疂闀滃儚鏀瑰洖npm鐨勩�傝繕鏈変竴鐐归渶瑕佹敞鎰忕殑鏄紝姣忔鍙戝竷閮介渶瑕佹洿鏂� `package.json` 鏂囦欢閲岀殑鐗堟湰鍙枫��
+
+### 寰俊灏忕▼搴� npm 鎵惧埌涓嶅埌npm鍖呯殑鍧戯紵
+
+缁勪欢寮�鍙戝畬锛屽紩鍏ヤ娇鐢ㄧ殑鏃跺�欙紝鍙戠幇npm鐨勫寘锛屾壘涓嶅埌浜嗭紵杩欓噷姣旇緝鍧戠殑鏄皬绋嬪簭鐨刵pm鏈夌壒娈婄殑浣跨敤鏂瑰紡銆�
+
+- 棣栧厛鍦ㄩ」鐩殑鏍圭洰褰曞垵濮嬪寲 npm:
+
+```
+npm init -f 
+```
+- 鐒跺悗瀹夎瀵瑰簲鐨勮嚜瀹氫箟缁勪欢鍖�
+
+```
+npm install -production聽miniprogram-table-component
+```
+> npm/cnpm/yarn add 鍧囧彲
+
+- 鍦ㄥ井淇″紑鍙戣�呭伐鍏蜂腑锛岃缃� 鈥�> 椤圭洰璁剧疆鈥�>聽鍕鹃�変娇鐢╪pm妯″潡銆�
+
+- 鍦ㄥ井淇″紑鍙戣�呭伐鍏蜂腑锛屽伐鍏� 鈥�> 鏋勫缓npm锛屾瀯寤哄畬鎴愪細鐢熸垚 `miniprogram_npm` 鏂囦欢澶癸紝椤圭洰鐢ㄥ埌鐨刵pm鍖呴兘鍦ㄨ繖閲屻��
+- 鎸夌収鑷繁鐨勪娇鐢ㄨ矾寰勶紝浠� `miniprogram_npm` 寮曞叆闇�瑕佺殑鍖呫��
+
+
+## 婧愮爜
+
+- [npm鍦板潃](https://www.npmjs.com/package/miniprogram-table-component)
+- [github鍦板潃](https://github.com/habc0807/miniprogram-table-component)
+
diff --git a/GoldC/node_modules/miniprogram-table-component/gulpfile.js b/GoldC/node_modules/miniprogram-table-component/gulpfile.js
new file mode 100644
index 0000000..fb292c2
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/gulpfile.js
@@ -0,0 +1,26 @@
+const gulp = require('gulp')
+const clean = require('gulp-clean')
+
+const config = require('./tools/config')
+const BuildTask = require('./tools/build')
+const id = require('./package.json').name || 'miniprogram-custom-component'
+
+// 鏋勫缓浠诲姟瀹炰緥
+// eslint-disable-next-line no-new
+new BuildTask(id, config.entry)
+
+// 娓呯┖鐢熸垚鐩綍鍜屾枃浠�
+gulp.task('clean', gulp.series(() => gulp.src(config.distPath, {read: false, allowEmpty: true}).pipe(clean()), done => {
+  if (config.isDev) {
+    return gulp.src(config.demoDist, {read: false, allowEmpty: true})
+      .pipe(clean())
+  }
+
+  return done()
+}))
+// 鐩戝惉鏂囦欢鍙樺寲骞惰繘琛屽紑鍙戞ā寮忔瀯寤�
+gulp.task('watch', gulp.series(`${id}-watch`))
+// 寮�鍙戞ā寮忔瀯寤�
+gulp.task('dev', gulp.series(`${id}-dev`))
+// 鐢熶骇妯″紡鏋勫缓
+gulp.task('default', gulp.series(`${id}-default`))
diff --git a/GoldC/node_modules/miniprogram-table-component/imgs/1.jpg b/GoldC/node_modules/miniprogram-table-component/imgs/1.jpg
new file mode 100644
index 0000000..923072a
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/imgs/1.jpg
Binary files differ
diff --git a/GoldC/node_modules/miniprogram-table-component/imgs/2.jpg b/GoldC/node_modules/miniprogram-table-component/imgs/2.jpg
new file mode 100644
index 0000000..b0922b7
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/imgs/2.jpg
Binary files differ
diff --git a/GoldC/node_modules/miniprogram-table-component/imgs/3.jpg b/GoldC/node_modules/miniprogram-table-component/imgs/3.jpg
new file mode 100644
index 0000000..9b45426
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/imgs/3.jpg
Binary files differ
diff --git a/GoldC/node_modules/miniprogram-table-component/imgs/4.jpg b/GoldC/node_modules/miniprogram-table-component/imgs/4.jpg
new file mode 100644
index 0000000..e332043
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/imgs/4.jpg
Binary files differ
diff --git a/GoldC/node_modules/miniprogram-table-component/imgs/5.jpg b/GoldC/node_modules/miniprogram-table-component/imgs/5.jpg
new file mode 100644
index 0000000..4f7b410
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/imgs/5.jpg
Binary files differ
diff --git a/GoldC/node_modules/miniprogram-table-component/imgs/6.jpg b/GoldC/node_modules/miniprogram-table-component/imgs/6.jpg
new file mode 100644
index 0000000..7117055
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/imgs/6.jpg
Binary files differ
diff --git a/GoldC/node_modules/miniprogram-table-component/imgs/7.jpg b/GoldC/node_modules/miniprogram-table-component/imgs/7.jpg
new file mode 100644
index 0000000..9a32763
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/imgs/7.jpg
Binary files differ
diff --git a/GoldC/node_modules/miniprogram-table-component/imgs/8.jpg b/GoldC/node_modules/miniprogram-table-component/imgs/8.jpg
new file mode 100644
index 0000000..37dd5cb
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/imgs/8.jpg
Binary files differ
diff --git a/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.js b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.js
new file mode 100644
index 0000000..04b1229
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.js
@@ -0,0 +1,192 @@
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Component({
+  /**
+   * 澶栭儴鏍峰紡绫�
+   */
+  externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'],
+
+  /**
+   * 缁勪欢鏍峰紡闅旂
+   */
+  options: {
+    styleIsolation: "isolated",
+    multipleSlots: true // 鏀寔澶氫釜slot
+  },
+
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+    data: {
+      type: Array,
+      value: []
+    },
+    headers: {
+      type: Array,
+      value: []
+    },
+    // table鐨勯珮搴�, 婧㈠嚭鍙粴鍔�
+    height: {
+      type: String,
+      value: 'auto'
+    },
+    width: {
+      type: Number || String,
+      value: '100%'
+    },
+    // 鍗曞厓鏍肩殑瀹藉害
+    tdWidth: {
+      type: Number,
+      value: 35
+    },
+    // 鍥哄畾琛ㄥご thead杈惧埌Header鐨勪綅缃椂灏卞簲璇ヨfixed浜�
+    offsetTop: {
+      type: Number,
+      value: 150
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    stripe: {
+      type: Boolean,
+      value: false
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    border: {
+      type: Boolean,
+      value: false
+    },
+    msg: {
+      type: String,
+      value: '鏆傛棤鏁版嵁~'
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    scrolWidth: '100%'
+  },
+
+  /**
+   * 缁勪欢鐨勭洃鍚睘鎬�
+   */
+  observers: {
+    // 鍦� numberA 鎴栬�� numberB 琚缃椂锛屾墽琛岃繖涓嚱鏁�
+    'headers': function headers(_headers) {
+      var reducer = function reducer(accumulator, currentValue) {
+        return accumulator + Number(currentValue.width);
+      };
+      var scrolWidth = _headers.reduce(reducer, 0);
+
+      this.setData({
+        scrolWidth: scrolWidth
+      });
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勬柟娉曞垪琛�
+   */
+  methods: {
+    onRowClick: function onRowClick(e) {
+      this.triggerEvent('rowClick', e, e.currentTarget.dataset.it);
+    }
+  }
+});
+
+/***/ })
+/******/ ]);
+//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.js.map b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.js.map
new file mode 100644
index 0000000..f50d4f8
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/index.js"],"names":["Component","externalClasses","options","styleIsolation","multipleSlots","properties","data","type","Array","value","headers","height","String","width","Number","tdWidth","offsetTop","stripe","Boolean","border","msg","scrolWidth","observers","reducer","accumulator","currentValue","reduce","setData","methods","onRowClick","e","triggerEvent","currentTarget","dataset","it"],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;AClFAA,UAAU;AACR;;;AAGAC,mBAAiB,CAAC,uBAAD,EAA0B,gBAA1B,EAA4C,iBAA5C,CAJT;;AAMR;;;AAGAC,WAAS;AACPC,oBAAgB,UADT;AAEPC,mBAAe,IAFR,CAEc;AAFd,GATD;;AAcR;;;AAGAC,cAAY;AACVC,UAAM;AACJC,YAAMC,KADF;AAEJC,aAAO;AAFH,KADI;AAKVC,aAAS;AACPH,YAAMC,KADC;AAEPC,aAAO;AAFA,KALC;AASV;AACAE,YAAQ;AACNJ,YAAMK,MADA;AAENH,aAAO;AAFD,KAVE;AAcVI,WAAO;AACLN,YAAMO,UAAUF,MADX;AAELH,aAAO;AAFF,KAdG;AAkBV;AACAM,aAAS;AACPR,YAAMO,MADC;AAEPL,aAAO;AAFA,KAnBC;AAuBV;AACAO,eAAW;AACTT,YAAMO,MADG;AAETL,aAAO;AAFE,KAxBD;AA4BV;AACAQ,YAAQ;AACNV,YAAMW,OADA;AAENT,aAAO;AAFD,KA7BE;AAiCV;AACAU,YAAQ;AACNZ,YAAMW,OADA;AAENT,aAAO;AAFD,KAlCE;AAsCVW,SAAK;AACHb,YAAMK,MADH;AAEHH,aAAO;AAFJ;AAtCK,GAjBJ;;AA6DR;;;AAGAH,QAAM;AACJe,gBAAY;AADR,GAhEE;;AAoER;;;AAGAC,aAAW;AACT;AACA,eAAW,iBAAUZ,QAAV,EAAmB;AAC5B,UAAMa,UAAU,SAAVA,OAAU,CAACC,WAAD,EAAcC,YAAd,EAA+B;AAC7C,eAAOD,cAAcV,OAAOW,aAAaZ,KAApB,CAArB;AACD,OAFD;AAGA,UAAMQ,aAAaX,SAAQgB,MAAR,CAAeH,OAAf,EAAwB,CAAxB,CAAnB;;AAEA,WAAKI,OAAL,CAAa;AACXN,oBAAYA;AADD,OAAb;AAGD;AAXQ,GAvEH;;AAqFR;;;AAGAO,WAAS;AACPC,cADO,sBACIC,CADJ,EACO;AACZ,WAAKC,YAAL,CAAkB,UAAlB,EAA8BD,CAA9B,EAAiCA,EAAEE,aAAF,CAAgBC,OAAhB,CAAwBC,EAAzD;AACD;AAHM;AAxFD,CAAV,E","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 0);\n","Component({\n  /**\n   * 澶栭儴鏍峰紡绫籠n   */\n  externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'], \n\n  /**\n   * 缁勪欢鏍峰紡闅旂\n   */\n  options: {\n    styleIsolation: \"isolated\", \n    multipleSlots: true, // 鏀寔澶氫釜slot\n  },\n\n  /**\n   * 缁勪欢鐨勫睘鎬у垪琛╘n   */\n  properties: {\n    data: {\n      type: Array,\n      value: []\n    },\n    headers: {\n      type: Array,\n      value: []\n    },\n    // table鐨勯珮搴�, 婧㈠嚭鍙粴鍔╘n    height: { \n      type: String,\n      value: 'auto'\n    },\n    width: {\n      type: Number || String,\n      value: '100%'\n    },\n    // 鍗曞厓鏍肩殑瀹藉害\n    tdWidth: {\n      type: Number,\n      value: 35\n    },\n    // 鍥哄畾琛ㄥご thead杈惧埌Header鐨勪綅缃椂灏卞簲璇ヨfixed浜哱n    offsetTop: {\n      type: Number,\n      value: 150\n    },\n    // 鏄惁甯︽湁绾靛悜杈规\n    stripe: {\n      type: Boolean,\n      value: false\n    },\n    // 鏄惁甯︽湁绾靛悜杈规\n    border: {\n      type: Boolean,\n      value: false\n    }, \n    msg: {\n      type: String,\n      value: '鏆傛棤鏁版嵁~'\n    }\n  },\n\n  /**\n   * 缁勪欢鐨勫垵濮嬫暟鎹甛n   */\n  data: {\n    scrolWidth: '100%'\n  },\n\n  /**\n   * 缁勪欢鐨勭洃鍚睘鎬n   */\n  observers: {\n    // 鍦� numberA 鎴栬�� numberB 琚缃椂锛屾墽琛岃繖涓嚱鏁癨n    'headers': function (headers) {\n      const reducer = (accumulator, currentValue) => {\n        return accumulator + Number(currentValue.width)\n      };\n      const scrolWidth = headers.reduce(reducer, 0)\n\n      this.setData({\n        scrolWidth: scrolWidth\n      })\n    }\n  },\n\n  /**\n   * 缁勪欢鐨勬柟娉曞垪琛╘n   */\n  methods: {\n    onRowClick(e) {\n      this.triggerEvent('rowClick', e, e.currentTarget.dataset.it)\n    },\n  }\n})"],"sourceRoot":""}
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.json b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.json
new file mode 100644
index 0000000..daecd9b
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {},
+  "componentGenerics": {
+    "genericsTest": true
+  }
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.wxml b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.wxml
new file mode 100644
index 0000000..9fd4cb3
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.wxml
@@ -0,0 +1,56 @@
+<scroll-view scroll-x="true" style="width:100%;"  class="table table-border">
+    <!-- 琛ㄦ牸澶� start -->
+    <view 
+        class="thead {{ border ? 'thead-border' : ''}} header-row-class-name" 
+        style="width:{{ scrolWidth }}rpx;"
+    >
+      <view 
+        wx:for="{{ headers }}" 
+        wx:key="*this" 
+        class="td" 
+        style="width:{{ item.width }}rpx;"
+      >
+      {{ item.label }}
+      </view>
+    </view>  
+    <!-- 琛ㄦ牸澶� end -->
+    
+    <!-- 琛ㄦ牸浣� start -->
+    <scroll-view 
+        scroll-y="true" 
+        class="tbody"
+        style="width:{{ scrolWidth }}rpx; height:{{ height ? height : 'auto' }};" 
+    >
+      <block 
+        wx:if="{{ data.length > 0 }}" 
+        wx:for-item="it" 
+        wx:for="{{ data }}" 
+        wx:key="*this" 
+        wx:for-index="idx"
+      >
+        <view class="tbody-tr {{ stripe ? 'tbody-tr-stripe' : '' }} {{ border ? 'tbody-tr-border' : ''}} row-class-name">
+          <view wx:for-item="head" 
+            wx:for="{{ headers }}" 
+            wx:key="*this" 
+            class="td cell-class-name" 
+            data-it="{{it}}" 
+            data-row="{{index}}" 
+            data-column="{{idx+1}}"
+            style="width:{{ headers[index].width }}rpx;color:{{ headers[index].color }};" 
+            bindtap="onRowClick"
+            bind:cellClick="onCellClick" 
+          >     
+          {{it[head["prop"]]}}
+          </view>
+          <!-- <slot name="action"></slot>         -->
+        </view>
+       
+      </block>
+      <!-- 鍒楄〃鏃犳暟鎹鐞� -->
+      <block wx:if="{{ data.length === 0 }}">
+        <view class="no-data">{{ msg }}</view>
+      </block>
+    </scroll-view>
+    <!-- 琛ㄦ牸浣� end -->
+</scroll-view>
+  
diff --git a/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.wxss b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.wxss
new file mode 100644
index 0000000..f38f79a
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/index.wxss
@@ -0,0 +1,82 @@
+.table {
+  position: relative;
+  font-size: 28rpx;
+  background: #fff;  
+  border-right:none;
+  border-radius: 8rpx;  
+  overflow: hidden;
+}
+.thead{
+  border-bottom: none;
+  display: flex;
+  justify-content: flex-start;
+  border-top-right-radius: 8rpx;
+  border-top-left-radius: 8rpx;
+  overflow: visible;
+  color: #909399;
+  border: 1px solid #ebeef5;
+  box-sizing: border-box;
+}
+.thead .td {
+  padding: 20rpx 10rpx;
+  font-weight: bold;
+  display: inline-block;   
+  text-align: center;
+  border-right: 1rpx solid #fff;
+}
+.thead .td:last-child {
+  border-right: none;
+}
+.thead-border .td {
+  border-right: 1rpx solid #ebeef5;
+}
+.thead-border .td:last-child {
+  border-right: none;
+}
+/* .tr{
+  display: flex;
+  white-space:nowrap; 
+} */
+.tbody {
+  box-sizing: border-box;
+  font-size: 28rpx;
+  color: #666;
+  border: 1px solid #ebeef5;
+  border-top: none;
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+.tbody-tr {
+  display: flex;
+  border-bottom: 1px solid #ebeef5;
+}
+.tbody-tr:last-child {
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+
+.tbody-tr-stripe {
+  background: #fff;
+  border-bottom: none;
+}
+.tbody-tr-stripe:nth-child(2n) {
+  background: #F6F6F6;
+}
+.tbody-tr .td {
+  white-space: wrap;
+  padding:20rpx 10rpx;
+  text-align: center;
+}
+
+.tbody-tr-border .td {
+  border-right: 1rpx solid #F6F6F6;
+}
+.tbody-tr-border .td:last-child {  
+  border-right: none;
+}
+.no-data {
+  display: flex;
+  padding: 50rpx;
+  color: #666;
+  justify-content: center;
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/lib.js b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/lib.js
new file mode 100644
index 0000000..aaaa944
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/lib.js
@@ -0,0 +1,105 @@
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */,
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.default = {
+    printf: function printf() {
+        return 'miniprogram-custom-component api demo';
+    }
+};
+
+/***/ })
+/******/ ]);
+//# sourceMappingURL=lib.js.map
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/lib.js.map b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/lib.js.map
new file mode 100644
index 0000000..92478c6
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/miniprogram_dist/lib.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/lib.ts"],"names":[],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;kBClFe;AACb,UADa,oBACP;AACJ,eAAO,uCAAP;AACD;AAHY,C","file":"lib.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 1);\n","export default {\r\n  printf() {\r\n    return 'miniprogram-custom-component api demo'\r\n  }\r\n}\r\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/package.json b/GoldC/node_modules/miniprogram-table-component/package.json
new file mode 100644
index 0000000..a23ed3f
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/package.json
@@ -0,0 +1,73 @@
+{
+  "name": "miniprogram-table-component",
+  "version": "1.1.0",
+  "description": "",
+  "main": "miniprogram_dist/index.js",
+  "scripts": {
+    "dev": "gulp dev --develop",
+    "watch": "gulp watch --develop --watch",
+    "build": "gulp",
+    "dist": "npm run build",
+    "clean-dev": "gulp clean --develop",
+    "clean": "gulp clean",
+    "test": "jest --bail",
+    "test-debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --bail",
+    "coverage": "jest ./test/* --coverage --bail",
+    "lint": "eslint \"src/**/*.js\" --fix",
+    "lint-tools": "eslint \"tools/**/*.js\" --rule \"import/no-extraneous-dependencies: false\" --fix"
+  },
+  "miniprogram": "miniprogram_dist",
+  "jest": {
+    "testEnvironment": "jsdom",
+    "testURL": "https://jest.test",
+    "collectCoverageFrom": [
+      "miniprogram_dist/**/*.js"
+    ],
+    "moduleDirectories": [
+      "node_modules",
+      "miniprogram_dist"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/habc0807/miniprogram-table-component"
+  },
+  "author": "wechat-miniprogram",
+  "license": "MIT",
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^2.28.0",
+    "@typescript-eslint/parser": "^2.28.0",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
+    "babel-plugin-module-resolver": "^3.2.0",
+    "babel-preset-env": "^1.7.0",
+    "colors": "^1.3.1",
+    "eslint": "^5.14.1",
+    "eslint-config-airbnb-base": "13.1.0",
+    "eslint-loader": "^2.1.2",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-node": "^7.0.1",
+    "eslint-plugin-promise": "^3.8.0",
+    "gulp": "^4.0.0",
+    "gulp-clean": "^0.4.0",
+    "gulp-if": "^2.0.2",
+    "gulp-install": "^1.1.0",
+    "gulp-less": "^4.0.1",
+    "gulp-rename": "^1.4.0",
+    "gulp-sourcemaps": "^2.6.5",
+    "jest": "^23.5.0",
+    "miniprogram-api-typings": "^2.10.3-1",
+    "miniprogram-simulate": "^1.2.0",
+    "thread-loader": "^2.1.3",
+    "through2": "^2.0.3",
+    "ts-loader": "^7.0.0",
+    "typescript": "^3.8.3",
+    "vinyl": "^2.2.0",
+    "webpack": "^4.29.5",
+    "webpack-node-externals": "^1.7.2"
+  },
+  "dependencies": {},
+  "__npminstall_done": true,
+  "_from": "miniprogram-table-component@1.1.0",
+  "_resolved": "https://registry.npmmirror.com/miniprogram-table-component/-/miniprogram-table-component-1.1.0.tgz"
+}
diff --git a/GoldC/node_modules/miniprogram-table-component/src/index.js b/GoldC/node_modules/miniprogram-table-component/src/index.js
new file mode 100644
index 0000000..4c89b36
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/src/index.js
@@ -0,0 +1,94 @@
+Component({
+  /**
+   * 澶栭儴鏍峰紡绫�
+   */
+  externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'], 
+
+  /**
+   * 缁勪欢鏍峰紡闅旂
+   */
+  options: {
+    styleIsolation: "isolated", 
+    multipleSlots: true, // 鏀寔澶氫釜slot
+  },
+
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+    data: {
+      type: Array,
+      value: []
+    },
+    headers: {
+      type: Array,
+      value: []
+    },
+    // table鐨勯珮搴�, 婧㈠嚭鍙粴鍔�
+    height: { 
+      type: String,
+      value: 'auto'
+    },
+    width: {
+      type: Number || String,
+      value: '100%'
+    },
+    // 鍗曞厓鏍肩殑瀹藉害
+    tdWidth: {
+      type: Number,
+      value: 35
+    },
+    // 鍥哄畾琛ㄥご thead杈惧埌Header鐨勪綅缃椂灏卞簲璇ヨfixed浜�
+    offsetTop: {
+      type: Number,
+      value: 150
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    stripe: {
+      type: Boolean,
+      value: false
+    },
+    // 鏄惁甯︽湁绾靛悜杈规
+    border: {
+      type: Boolean,
+      value: false
+    }, 
+    msg: {
+      type: String,
+      value: '鏆傛棤鏁版嵁~'
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    scrolWidth: '100%'
+  },
+
+  /**
+   * 缁勪欢鐨勭洃鍚睘鎬�
+   */
+  observers: {
+    // 鍦� numberA 鎴栬�� numberB 琚缃椂锛屾墽琛岃繖涓嚱鏁�
+    'headers': function (headers) {
+      const reducer = (accumulator, currentValue) => {
+        return accumulator + Number(currentValue.width)
+      };
+      const scrolWidth = headers.reduce(reducer, 0)
+
+      this.setData({
+        scrolWidth: scrolWidth
+      })
+    }
+  },
+
+  /**
+   * 缁勪欢鐨勬柟娉曞垪琛�
+   */
+  methods: {
+    onRowClick(e) {
+      this.triggerEvent('rowClick', e, e.currentTarget.dataset.it)
+    },
+  }
+})
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/src/index.json b/GoldC/node_modules/miniprogram-table-component/src/index.json
new file mode 100644
index 0000000..daecd9b
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/src/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {},
+  "componentGenerics": {
+    "genericsTest": true
+  }
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/src/index.wxml b/GoldC/node_modules/miniprogram-table-component/src/index.wxml
new file mode 100644
index 0000000..24816d8
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/src/index.wxml
@@ -0,0 +1,53 @@
+<scroll-view scroll-x="true" style="width:100%;"  class="table table-border">
+    <!-- 琛ㄦ牸澶� start -->
+    <view 
+        class="thead {{ border ? 'thead-border' : ''}} header-row-class-name" 
+        style="width:{{ scrolWidth }}rpx;"
+    >
+      <view 
+        wx:for="{{ headers }}" 
+        wx:key="*this" 
+        class="td" 
+        style="width:{{ item.width }}rpx;"
+      >
+      {{ item.label }}
+      </view>
+    </view>  
+    <!-- 琛ㄦ牸澶� end -->
+    
+    <!-- 琛ㄦ牸浣� start -->
+    <scroll-view 
+        scroll-y="true" 
+        class="tbody"
+        style="width:{{ scrolWidth }}rpx; height:{{ height ? height : 'auto' }};" 
+    >
+      <block 
+        wx:if="{{ data.length > 0 }}" 
+        wx:for-item="it" 
+        wx:for="{{ data }}" 
+        wx:key="*this" 
+        wx:for-index="idx"
+      >
+        <view class="tbody-tr {{ stripe ? 'tbody-tr-stripe' : '' }} {{ border ? 'tbody-tr-border' : ''}} row-class-name">
+          <view wx:for-item="head" 
+            wx:for="{{ headers }}" 
+            wx:key="*this" 
+            class="td cell-class-name" 
+            data-it="{{it}}" 
+            data-row="{{index}}" 
+            data-column="{{idx+1}}"
+            style="width:{{ headers[index].width }}rpx;color:{{ headers[index].color }};" 
+            bindtap="onRowClick"
+          >     
+          {{it[head["prop"]]}}
+          </view>        
+        </view>
+      </block>
+      <!-- 鍒楄〃鏃犳暟鎹鐞� -->
+      <block wx:if="{{ data.length === 0 }}">
+        <view class="no-data">{{ msg }}</view>
+      </block>
+    </scroll-view>
+    <!-- 琛ㄦ牸浣� end -->
+</scroll-view>
+  
diff --git a/GoldC/node_modules/miniprogram-table-component/src/index.wxss b/GoldC/node_modules/miniprogram-table-component/src/index.wxss
new file mode 100644
index 0000000..f38f79a
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/src/index.wxss
@@ -0,0 +1,82 @@
+.table {
+  position: relative;
+  font-size: 28rpx;
+  background: #fff;  
+  border-right:none;
+  border-radius: 8rpx;  
+  overflow: hidden;
+}
+.thead{
+  border-bottom: none;
+  display: flex;
+  justify-content: flex-start;
+  border-top-right-radius: 8rpx;
+  border-top-left-radius: 8rpx;
+  overflow: visible;
+  color: #909399;
+  border: 1px solid #ebeef5;
+  box-sizing: border-box;
+}
+.thead .td {
+  padding: 20rpx 10rpx;
+  font-weight: bold;
+  display: inline-block;   
+  text-align: center;
+  border-right: 1rpx solid #fff;
+}
+.thead .td:last-child {
+  border-right: none;
+}
+.thead-border .td {
+  border-right: 1rpx solid #ebeef5;
+}
+.thead-border .td:last-child {
+  border-right: none;
+}
+/* .tr{
+  display: flex;
+  white-space:nowrap; 
+} */
+.tbody {
+  box-sizing: border-box;
+  font-size: 28rpx;
+  color: #666;
+  border: 1px solid #ebeef5;
+  border-top: none;
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+.tbody-tr {
+  display: flex;
+  border-bottom: 1px solid #ebeef5;
+}
+.tbody-tr:last-child {
+  border-bottom-left-radius: 8rpx;
+  border-bottom-right-radius: 8rpx;
+}
+
+.tbody-tr-stripe {
+  background: #fff;
+  border-bottom: none;
+}
+.tbody-tr-stripe:nth-child(2n) {
+  background: #F6F6F6;
+}
+.tbody-tr .td {
+  white-space: wrap;
+  padding:20rpx 10rpx;
+  text-align: center;
+}
+
+.tbody-tr-border .td {
+  border-right: 1rpx solid #F6F6F6;
+}
+.tbody-tr-border .td:last-child {  
+  border-right: none;
+}
+.no-data {
+  display: flex;
+  padding: 50rpx;
+  color: #666;
+  justify-content: center;
+}
\ No newline at end of file
diff --git a/GoldC/node_modules/miniprogram-table-component/src/lib.ts b/GoldC/node_modules/miniprogram-table-component/src/lib.ts
new file mode 100644
index 0000000..20d0c43
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/src/lib.ts
@@ -0,0 +1,5 @@
+export default {
+  printf() {
+    return 'miniprogram-custom-component api demo'
+  }
+}
diff --git a/GoldC/node_modules/miniprogram-table-component/tsconfig.json b/GoldC/node_modules/miniprogram-table-component/tsconfig.json
new file mode 100644
index 0000000..bfea1f2
--- /dev/null
+++ b/GoldC/node_modules/miniprogram-table-component/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "module": "esnext",
+    "target": "es2015",
+    "lib": ["es2015", "es2017", "dom"],
+    "noImplicitAny": false,
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "baseUrl": ".",
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata":true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true
+  },
+  "files": [
+    "node_modules/miniprogram-api-typings/index.d.ts"
+  ],
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
diff --git a/GoldC/package-lock.json b/GoldC/package-lock.json
index ac4370e..25f9b1b 100644
--- a/GoldC/package-lock.json
+++ b/GoldC/package-lock.json
@@ -1,9 +1,35 @@
 {
   "name": "goldc",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "goldc",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "miniprogram-table-component": "^1.1.0",
+        "vant-weapp": "^0.5.28"
+      }
+    },
+    "node_modules/miniprogram-table-component": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/miniprogram-table-component/-/miniprogram-table-component-1.1.0.tgz",
+      "integrity": "sha512-TRgo+2ouPqPI42EcXUM/5BndZAueWtk0v2tDmImujYPtmFWiQT/lmgL9TgUFWowfoFM5HsKrLqagIrMKXj9bRw=="
+    },
+    "node_modules/vant-weapp": {
+      "version": "0.5.28",
+      "resolved": "https://registry.npmjs.org/vant-weapp/-/vant-weapp-0.5.28.tgz",
+      "integrity": "sha512-GAJ2PTLuhXHWpAD5B7DdRQdkEFMdjdduuMzKkThUjIiQ63ESnaJvIEUbW3RgiUNNV7PYXwhOFOd6woR/JsTFLA=="
+    }
+  },
   "dependencies": {
+    "miniprogram-table-component": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/miniprogram-table-component/-/miniprogram-table-component-1.1.0.tgz",
+      "integrity": "sha512-TRgo+2ouPqPI42EcXUM/5BndZAueWtk0v2tDmImujYPtmFWiQT/lmgL9TgUFWowfoFM5HsKrLqagIrMKXj9bRw=="
+    },
     "vant-weapp": {
       "version": "0.5.28",
       "resolved": "https://registry.npmjs.org/vant-weapp/-/vant-weapp-0.5.28.tgz",
diff --git a/GoldC/package.json b/GoldC/package.json
index c77cf1d..bb10134 100644
--- a/GoldC/package.json
+++ b/GoldC/package.json
@@ -1,7 +1,6 @@
 {
   "name": "goldc",
   "version": "1.0.0",
-  "description": "",
   "main": "app.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -9,6 +8,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "miniprogram-table-component": "^1.1.0",
     "vant-weapp": "^0.5.28"
-  }
+  },
+  "keywords": [],
+  "description": ""
 }
diff --git a/GoldC/pages/deviceDetails/deviceDetails.js b/GoldC/pages/deviceDetails/deviceDetails.js
index cb47dc4..7bb4c1e 100644
--- a/GoldC/pages/deviceDetails/deviceDetails.js
+++ b/GoldC/pages/deviceDetails/deviceDetails.js
@@ -5,24 +5,32 @@
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
+    deviceInfo:{},
     menuList: [
       { title: '婊よ姱鐘舵��', img: '', url: '/pages/filterStatus/filterStatus', icon: 'iconfont icon-shebeizhuangtai',img:'/images/status.png' },
       { title: '鐢ㄦ按缁熻', img: '', url: '/pages/waterUses/waterUses', icon: 'iconfont icon-icon_function_tongji' ,img:'/images/tj.png'},
-      { title: '璁惧鏃ュ織', img: '', url: '/pages/devicelogs/devicelogs', icon: 'iconfont icon-zhuanxierizhi' ,img:'/images/log.png'},
+      { title: '璁惧璇︽儏', img: '', url: '/pages/devicelogs/devicelogs', icon: 'iconfont icon-zhuanxierizhi' ,img:'/images/log.png'},
       { title: '鏁呴殰鎶ヤ慨', img: '', url: '/pages/repair/repair', icon: 'iconfont icon-baoxiu',img:'/images/repire.png' },
-
     ]
 
   },
   goItem(item) {
     wx.navigateTo({
-      url: item.currentTarget.dataset.item.url,
+      url: `${item.currentTarget.dataset.item.url}?params=${JSON.stringify( this.data.deviceInfo)}`,
     })
   },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
+    let deviceInfo=JSON.parse(options.params)
+    this.setData({
+      deviceInfo:deviceInfo
+    })
+    銆�wx.setNavigationBarTitle({
+      銆�銆�銆�銆�title: deviceInfo.deviceName //椤甸潰鍒囨崲锛屾洿鎹㈤〉闈㈡爣棰�
+      銆�銆�})
+    console.log(this.data.deviceInfo);
 
   },
 
diff --git a/GoldC/pages/deviceDetails/deviceDetails.wxml b/GoldC/pages/deviceDetails/deviceDetails.wxml
index d50a39b..3661c05 100644
--- a/GoldC/pages/deviceDetails/deviceDetails.wxml
+++ b/GoldC/pages/deviceDetails/deviceDetails.wxml
@@ -1,11 +1,11 @@
 <view class="header">
-  <view class="type">
+  <!-- <view class="type">
     鍦ㄧ嚎
-  </view>
+  </view> -->
   <view class="main">
     <view class="info">
-      <view style="color: #007CFE;">鍓╀綑澶╂暟</view>
-      <view style="font-size: 18px;color: #007CFE;margin: 5px 0 20px;">111</view>
+      <view style="color: #007CFE;">璁惧鐘舵��</view>
+      <view style="font-size: 18px;color: #007CFE;margin: 5px 0 20px;">{{deviceInfo.dictLabel}}</view>
       <view style="width: 90%;height: 2px;background-color: #808080;margin-left: 5%;"></view>
       <view style="margin-top: 20px;color: #007CFE;">寮�鏈�</view>
     </view>
diff --git a/GoldC/pages/devicelogs/devicelogs.js b/GoldC/pages/devicelogs/devicelogs.js
index 8ca331c..6c480cd 100644
--- a/GoldC/pages/devicelogs/devicelogs.js
+++ b/GoldC/pages/devicelogs/devicelogs.js
@@ -5,15 +5,86 @@
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
-
+    deviceInfo: {},
+    deviceDetail: {},
+    marker: []
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
+    console.log(options);
+    let deviceInfo = JSON.parse(options.params)
+    this.setData({
+      deviceInfo: deviceInfo
+    })
+    wx.setNavigationBarTitle({
+      title: deviceInfo.deviceName //椤甸潰鍒囨崲锛屾洿鎹㈤〉闈㈡爣棰�
+    })
+    this.getDeviceInfo()
 
   },
+  getDeviceInfo() {
+    let that = this
+    wx.request({
+      url: `https://puyue.yhupai.com/prod-api/iot/device/${this.data.deviceInfo.deviceId}`,
+      method: 'GET',
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      success(res) {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          let mapInfo = res.data.data
+          // console.log(res.data.data);
+          var marker = [{
+            latitude: mapInfo.latitude,
+            longitude: mapInfo.longitude,
+            iconPath: '../../images/ProRep/weizhi.png',
+            width: '50rpx',
+            height: "50rpx",
+            callout: {
+              color: '#000000',
+              content: mapInfo.deviceName,
+              fontSize: 12,
+              borderRadius: 5,
+              bgColor: '#ffffff',
+              padding: 10,
+              textAlign: 'center',
+              display: "ALWAYS"
+              // anchorY:-18
+            }
+          }]
+
+          that.setData({
+            deviceDetail: res.data.data,
+            marker: marker
+          })
+        }
+      }
+    })
+  },
+  goMap() {
+    let plugin = requirePlugin('routePlan');
+    let key = 'SRGBZ-FLCKU-2TIVH-BFHUM-D5CTO-LFBHQ';  //浣跨敤鍦ㄨ吘璁綅缃湇鍔$敵璇风殑key
+    let referer = '楂樺痉鍦板浘';   //璋冪敤鎻掍欢鐨刟pp鐨勫悕绉�
+    let endPoint = JSON.stringify({  //缁堢偣
+      'name': '1111',
+      'latitude': this.data.deviceDetail.latitude,
+      'longitude': this.data.deviceDetail.longitude
+    });
+    wx.navigateTo({
+      url: 'plugin://routePlan/index?key=' + key + '&referer=' + referer + '&endPoint=' + endPoint
+    });
+
+  },
+
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
diff --git a/GoldC/pages/devicelogs/devicelogs.wxml b/GoldC/pages/devicelogs/devicelogs.wxml
index c24f7b5..8406d34 100644
--- a/GoldC/pages/devicelogs/devicelogs.wxml
+++ b/GoldC/pages/devicelogs/devicelogs.wxml
@@ -1,15 +1,10 @@
-<!--pages/repair/repair.wxml-->
-<!-- <text>pages/repair/repair.wxml</text> -->
 <view class="title">
-  <view class="left">
-    涓婃媺鍒锋柊鍒楄〃锛屼笅婊戝姞杞藉彟涓�椤�
-  </view>
-  <view class="right">
-    <!-- <view style="margin-right: 10px;">
-      鍒锋柊
-    </view>
-    <view bind:tap="goRepairTicketDetail">
-      娣诲姞
-    </view> -->
-  </view>
+  <image class="primg" src="/images/ProRep/weizhi.png"></image>
+  鍦板浘瀹氫綅锛�
 </view>
+<view class="map">
+  <map style="width:100%;height:100%" latitude="{{deviceDetail.latitude}}" longitude="{{deviceDetail.longitude}}" markers="{{marker}}"></map>
+</view>
+<view bind:tap="goMap" style=" background-color: #1E90FF;color: white;width: 94%;text-align: center;height: 40px;line-height: 40px;margin-left:3% ;margin-top: 20px;border-radius: 5px;">
+  鍦板浘瀵艰埅
+</view>
\ No newline at end of file
diff --git a/GoldC/pages/devicelogs/devicelogs.wxss b/GoldC/pages/devicelogs/devicelogs.wxss
index 4a8dbcd..c61ef7a 100644
--- a/GoldC/pages/devicelogs/devicelogs.wxss
+++ b/GoldC/pages/devicelogs/devicelogs.wxss
@@ -1,18 +1,15 @@
-/* pages/repair/repair.wxss */
 .title{
+  color: #000000;
+  font-size: 30rpx;
+  margin-top: 15rpx;
+  font-weight: 700;
+}
+.map{
   width: 100%;
-  margin:0 0px 5px;
-  display: flex;
-  justify-content: space-between;
-  background-color: #fff;
-  height: 40px;
-  line-height: 40px;
+  height: 450rpx;
 }
-.title .left{
-  margin-left: 5px;
-}
-.title .right{
-  margin-right: 5px;
-  display: flex;
-  justify-content: space-between;
+.primg{
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
 }
\ No newline at end of file
diff --git a/GoldC/pages/home/home.js b/GoldC/pages/home/home.js
index f8d1c74..689fa3c 100644
--- a/GoldC/pages/home/home.js
+++ b/GoldC/pages/home/home.js
@@ -8,9 +8,10 @@
    */
   data: {
     manageList: [
-      { title: '缃戝叧璁惧', img: '', type: '鍦ㄧ嚎', text: '褰卞瓙' },
-      { title: '缃戝叧璁惧', img: '', type: '鍦ㄧ嚎', text: '褰卞瓙' },
-    ]
+      // { title: '缃戝叧璁惧', img: '', type: '鍦ㄧ嚎', text: '褰卞瓙' },
+      // { title: '缃戝叧璁惧', img: '', type: '鍦ㄧ嚎', text: '褰卞瓙' },
+    ],
+    statuList: []
 
   },
 
@@ -18,7 +19,11 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad: function (options) {
+    // var user = wx.getStorageSync('user')
     var user = wx.getStorageSync('user')
+    // this.getStatus()
+    // this.getProfile()
+    // this.getShortList()
   },
 
   goScanCode() {
@@ -26,10 +31,94 @@
       url: '/pages/scanCode/scanCode',
     })
   },
-  goDetails() {
+  goDetails(e) {
+
+    var $id = e.currentTarget.dataset.index;
+    let params=JSON.stringify(this.data.manageList[$id])
     wx.navigateTo({
-      url: '/pages/deviceDetails/deviceDetails',
+      url: `/pages/deviceDetails/deviceDetails?params=${params}`,
     })
+  },
+  getProfile() {
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/system/user/profile',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          wx.setStorageSync('userInfo', res.data.data)
+        }
+      }
+    })
+  },
+  getShortList() {
+    // let data = {
+    //   status:3
+    // }
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/iot/device/shortList',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      // params: data,
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          console.log(this.data.statuList);
+          let arr = res.data.rows
+          for (let i = 0; i < arr.length; i++) {
+            for (let k = 0; k < this.data.statuList.length; k++) {
+              if (arr[i].status == this.data.statuList[k].dictValue) {
+                arr[i].dictLabel = this.data.statuList[k].dictLabel
+              }
+            }
+          }
+          console.log(arr);
+          this.setData({
+            manageList: arr
+          })
+          wx.setStorageSync('deviceList', arr)
+        }
+      }
+    })
+  },
+  getStatus() {
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/system/dict/data/type/iot_device_status',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          // wx.setStorageSync('userInfo', res.data.data)
+          this.setData({
+            statuList: res.data.data
+          })
+        }
+      }
+    })
+
   },
 
   /**
@@ -37,13 +126,17 @@
    */
   onReady: function () {
 
+
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow: function () {
-    var user = wx.getStorageSync('user')
+    this.getStatus()
+    this.getProfile()
+    this.getShortList()
+    console.log(111);
 
   },
 
diff --git a/GoldC/pages/home/home.wxml b/GoldC/pages/home/home.wxml
index abf71b1..4258cfb 100644
--- a/GoldC/pages/home/home.wxml
+++ b/GoldC/pages/home/home.wxml
@@ -3,10 +3,10 @@
   鎴戠殑璁惧
 </view>
 <view class="list">
-  <view class="item" wx:for="{{manageList}}" bind:tap="goDetails">
+  <view class="item" wx:for="{{manageList}}"  data-index="{{index}}" bind:tap="goDetails">
     <view class="title">
       <view class="type"><text class="iconfont icon-xingxing"></text>
- {{item.title}}</view>
+        {{item.deviceName}}</view>
       <view><text class="iconfont icon-xiangyoujiantou"></text></view>
     </view>
     <view class="content">
@@ -15,14 +15,19 @@
         111
       </view>
       <view class="right">
-        <view class="type">{{item.type}}</view>
-        <view class="text">{{item.text}}</view>
+        <view class="type">{{item.dictLabel}}</view>
+        <view class="text" style="width: 42px;">
+          <!-- {{item.dictLabel}} -->
+          <view wx:if="{{item.isShadow==0}}" style="padding: 2px;border: 1px solid #E6EBF5;text-align: center;background-color: #F4F4F5;color: #909399;">褰卞瓙</view>
+          <view wx:if="{{item.isShadow==1}}" style="padding: 2px;border: 1px solid #E6EBF5;text-align: center;background-color: #E7FAF0;color: #13CE78;">褰卞瓙</view>
+
+        </view>
       </view>
     </view>
   </view>
 
   <view class="item">
-      <view class="add" bind:tap="goScanCode">+</view>
+    <view class="add" bind:tap="goScanCode">+</view>
   </view>
 
 
diff --git a/GoldC/pages/home/home.wxss b/GoldC/pages/home/home.wxss
index a9c637d..9dc5892 100644
--- a/GoldC/pages/home/home.wxss
+++ b/GoldC/pages/home/home.wxss
@@ -38,10 +38,12 @@
 
 .list .item .content .left {
   line-height: 50px;
-}
 
+}
 .list .item .content .right {
   padding-top: 5px;
+  text-align: right;
+
 }
 
 .list .item .add {
diff --git a/GoldC/pages/login/login.js b/GoldC/pages/login/login.js
index b5548b4..8a4b5d9 100644
--- a/GoldC/pages/login/login.js
+++ b/GoldC/pages/login/login.js
@@ -9,8 +9,8 @@
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
-    userName: 'sdlys',
-    psw: '123456',
+    userName: 'admin',
+    psw: 'admin123',
     codeNum: '',
     loginImg: '/images/login.png',
     uuid: '',
@@ -21,14 +21,13 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad: function (options) {
-
     if (wx.getStorageSync('user')) {
       app.setUser(wx.getStorageSync('user'))
       wx.switchTab({
         url: '/pages/home/home',
       })
     }
-    this.getImg()
+    // this.getImg()
   },
   // 缁戝畾鐢ㄦ埛鍚�
   bindUserName(e) {
@@ -51,14 +50,61 @@
     })
     console.log(this.data.codeNum);
   },
+  getProfile() {
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/system/user/profile',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          wx.setStorageSync('userInfo', res.data.data)
+        }
+      }
+    })
+  },
+  getInfo() {
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/getInfo',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          // let data = JSON.parse(JSON.stringify(res.data))
+          // let erectoId = data.user.userId
 
+          console.log(res.data.user.userId);
+          wx.setStorageSync('userInfo', res.data)
+          wx.setStorageSync('roleKey', res.data.user.roles[0].roleKey)
+          wx.setStorageSync('deptId', res.data.user.dept.deptId)
+          wx.setStorageSync('erectoId', res.data.user.userId)
+          // console.log(wx.getStorageInfoSync('erectoId'));
+        }
+      }
+    })
+  },
   // 鐧诲綍
   login() {
     console.log(this.data);
     wx.showLoading({
       title: '鐧诲綍涓�',
     })
-   
+
     loginRequest(this.data.userName, this.data.psw, this.data.codeNum, this.data.uuid).then(res => {
       console.log(res);
       if (res.data.code != 200) {
@@ -66,23 +112,16 @@
           title: res.data.msg,
           icon: "none"
         })
+        this.getImg()
       } else {
         wx.setStorageSync('token', res.data.token)
         wx.showToast({
           title: '鐧诲綍鎴愬姛锛�',
           icon: 'none'
         });
+        this.getInfo()
 
-        // // console.log(res);
-        // this.$store.dispatch('setUserData', {
-        //   'token': res.data.token
-        // });
-        // uni.setStorageSync('token', res.data.token)
-        // uni.setStorageSync('userName', this.login.phoneNumber)
-
-        // this.$Router.pushTab({
-        //   path: '/pages/home/index',
-        // });
+     
         app.setUser(res.data)
         wx.hideLoading({
           success: (res) => {
@@ -92,22 +131,6 @@
           },
         })
 
-        // if (res.statusCode == 200) {
-        //   app.setUser(res.data.Data)
-        //   wx.hideLoading({
-        //     success: (res) => {
-        //       wx.switchTab({
-        //         url: '/pages/home/home',
-        //       })
-        //     },
-        //   })
-        // } else {
-        //   wx.showToast({
-        //     title: '璇锋鏌ユ偍鐨勭綉缁滆缃�',
-        //     icon: "none"
-        //   })
-        // }
-        
       }
     }).catch(() => {
 
@@ -131,14 +154,14 @@
     this.setData({
       imgSrc: "",
       uuid: "",
-      codeNum:''
+      codeNum: ''
     })
     wx.request({
       url: `https://puyue.yhupai.com/prod-api/captchaImage`,
       method: 'GET',
-      header: {
-        "Access-Control-Allow-Headers": 'token'
-      },
+      // header: {
+      //   "Access-Control-Allow-Headers": 'token'
+      // },
       dataType: 'json',
       success: (res, header) => {
         // console.log(res);
@@ -152,6 +175,7 @@
             imgSrc: "data:image/gif;base64," + res.data.img,
             uuid: res.data.uuid
           })
+          console.log(this.data.imgSrc)
           // this.imgSrc = "data:image/gif;base64," + res.data.img
           // this.login.uuid = res.data.uuid
           // console.log(this.imgSrc);
@@ -171,7 +195,7 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow: function () {
-
+    this.getImg()
   },
 
   /**
diff --git a/GoldC/pages/notice/components/page/index.js b/GoldC/pages/notice/components/page/index.js
new file mode 100644
index 0000000..7d2d589
--- /dev/null
+++ b/GoldC/pages/notice/components/page/index.js
@@ -0,0 +1,171 @@
+// components/paging/index.js
+Component({
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+    currentIndex: { //褰撳墠椤电爜
+      type: Number,
+      value: 1
+    },
+    totalPage: {
+      type: Number
+    }
+  },
+ 
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    index: 1,
+    total: 0,
+    pageMask: false,
+    prevBtnDis: true,
+    nextBtnDis: true
+  },
+ 
+  /**
+   * 缁勪欢鐨勬柟娉曞垪琛�
+   */
+  lifetimes: {
+     // 鍦ㄧ粍浠跺疄渚嬭繘鍏ラ〉闈㈣妭鐐规爲鏃舵墽琛�
+    attached: function () {
+      this.setData({
+        index: this.data.currentIndex,
+        total: this.data.totalPage
+      })
+    },
+    // 鍦ㄧ粍浠跺疄渚嬭浠庨〉闈㈣妭鐐规爲绉婚櫎鏃舵墽琛�
+    detached: function () {
+      
+    }
+  },
+  methods: {
+    //姣忔鏀瑰彉椤电爜灏辫皟鐢ㄨ鍑芥暟
+    currentChangeEmit: function (touchState) {
+      // 鑷畾涔夌粍浠跺悜鐖剁粍浠朵紶鍊� 
+        const option = {
+          currentIndex: this.data.index,
+          touchState: true
+        };
+      if (touchState) option.touchState = !touchState;
+      // pagingChange 鑷畾涔夊悕绉颁簨浠讹紝鐖剁粍浠朵腑浣跨敤
+      this.triggerEvent('pagingChange', option)
+      /*
+       鍦ㄧ埗缁勪欢涓啓涓奲ind:pagingChanget="get_emit",鍦ㄧ埗缁勪欢涓氨闇�瑕佽皟鐢╣et_emit浜嬩欢
+      */
+    },
+    //寮�鍚〉鐮佸脊绐�
+    shopPagePopup: function () {
+      this.setData({
+        pageMask: true
+      })
+    },
+    //鍏抽棴椤电爜寮圭獥
+    hidePagePopup: function () {
+      this.setData({
+        pageMask: false
+      })
+    },
+    //鏇存敼椤电爜鐐瑰嚮浜嬩欢
+    changePage: function (e) {
+      //console.log("鏇存敼椤电爜浜嬩欢锛�",e);
+      this.setData({
+        pageMask: false,
+        index: e.currentTarget.dataset.index
+      })
+      if (this.data.prevBtnDis || this.data.nextBtnDis) {
+        this.currentChangeEmit(true);
+      }else{
+        this.currentChangeEmit();
+      }
+      this.judgeBtnDis();
+      this.setData({
+        index: this.data.currentIndex,
+        total: this.data.totalPage
+      })
+    },
+    //涓婁竴椤电偣鍑讳簨浠�
+    prevPage: function () {
+      let num = (this.data.index == 1) ? 1 : this.data.index - 1;
+      this.setData({
+        index: num
+      })
+      if (this.data.prevBtnDis) {
+        this.currentChangeEmit(true);
+      } else {
+        this.currentChangeEmit();
+      }
+      this.judgeBtnDis();
+      this.setData({
+        index: this.data.currentIndex,
+        total: this.data.totalPage
+      })
+    },
+    //涓嬩竴椤电偣鍑讳簨浠�
+    nextPage: function () {
+      let num = (this.data.index == this.data.total) ? this.data.total : this.data.index + 1;
+      this.setData({
+        index: num
+      })
+      if (this.data.nextBtnDis) {
+        this.currentChangeEmit(true);
+      } else {
+        this.currentChangeEmit();
+      }
+      this.judgeBtnDis();
+      this.setData({
+        index: this.data.currentIndex,
+        total: this.data.totalPage
+      })
+    },
+    //鍒ゆ柇鎸夐挳鏄惁涓篸isabled
+    judgeBtnDis: function () {
+      let index = this.data.index;
+      if (index == this.data.total) {
+        this.setData({
+          nextBtnDis: true
+        })
+        if(index==1){
+          this.setData({
+            prevBtnDis: true
+          })
+        }else{
+          this.setData({
+            prevBtnDis: false
+          })
+        }
+      } else if (index == 1){
+        this.setData({
+          prevBtnDis: true
+        })
+        if (index == this.data.total){
+          this.setData({
+            nextBtnDis: true
+          })
+        }else{
+          this.setData({
+            nextBtnDis: false
+          })
+        }
+      }else{
+        this.setData({
+          prevBtnDis: false
+        })
+        this.setData({
+          nextBtnDis: false
+        })
+      }
+    },
+   
+  
+  },
+  observers: {
+    'totalPage': function(rate) {
+      this.setData({
+        index: this.data.currentIndex,
+        total: this.data.totalPage
+      })
+    }
+  }
+})
diff --git a/GoldC/pages/notice/components/page/index.json b/GoldC/pages/notice/components/page/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/GoldC/pages/notice/components/page/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/GoldC/pages/notice/components/page/index.wxml b/GoldC/pages/notice/components/page/index.wxml
new file mode 100644
index 0000000..9571b4f
--- /dev/null
+++ b/GoldC/pages/notice/components/page/index.wxml
@@ -0,0 +1,17 @@
+<!--pages/notice/components/page/index.wxml-->
+<!--components/paging/index.wxml-->
+<view class="page-control">
+  <view class="page-control-btns">
+    <view class="page-btn {{prevBtnDis?'btn-disabled':''}}" bindtap="prevPage">涓婁竴椤�</view>
+    <view class="page-number" bindtap="shopPagePopup"><text>{{index}}</text>/<text>{{total}}</text></view>    
+    <view class="page-btn {{nextBtnDis?'btn-disabled':''}}" bindtap="nextPage">涓嬩竴椤�</view>
+  </view>
+  <view class="page-container" hidden="{{!pageMask}}">
+    <view class="page-mask" bindtap="hidePagePopup"></view>
+    <view class="page-popup">
+      <view class="page-popup-box">
+        <view class="page-line" wx:for="{{total}}" wx:for-index="ind" data-index="{{ind+1}}" bindtap="changePage">绗瑊{item+1}}椤�</view>
+      </view>
+    </view>
+  </view>
+</view>
diff --git a/GoldC/pages/notice/components/page/index.wxss b/GoldC/pages/notice/components/page/index.wxss
new file mode 100644
index 0000000..80adb9d
--- /dev/null
+++ b/GoldC/pages/notice/components/page/index.wxss
@@ -0,0 +1,84 @@
+/* pages/notice/components/page/index.wxss */
+/* components/paging/index.wxss */
+view,text,image{
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
+}
+.page-control{
+  width: 100%;
+}
+.page-control .page-control-btns{
+  width: 100%;
+  padding: 20rpx 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.page-control .page-control-btns .page-number{
+  width: 20%;
+  text-align: center;
+  color: #333;
+}
+.page-control .page-control-btns .page-number:active{
+  background-color: #ddd;
+}
+.page-control .page-control-btns .page-btn{
+  width: 30%;
+  padding: 15rpx 20rpx;
+  font-size: 30rpx;
+  background-color: #0099CC;
+  color: #fff;
+  border-radius: 10rpx;
+  text-align: center;
+}
+.page-control .page-control-btns .page-btn:active{
+  opacity: .5;
+}
+.page-control .page-control-btns .btn-disabled{
+  background-color: #ddd;
+  color: #999;
+}
+.page-container{
+  position: fixed;
+  top: 0rpx;
+  left: 0rpx;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+}
+.page-mask{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background-color: rgba(0,0,0,0.5);
+}
+.page-popup{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: center;
+}
+.page-popup-box{
+  width: 60%;
+  margin: 0 auto;
+  background-color: #fff;
+  height: 60%;
+  border-radius: 10rpx;
+  z-index: 9999;
+  overflow: auto;
+}
+.page-line{
+  width: 100%;
+  height: 80rpx;
+  line-height: 80rpx;
+  padding: 0rpx 20rpx;
+  border-bottom: 1rpx solid #e2e2e2;
+}
+.page-line:active{
+  background-color: #ddd;
+}
\ No newline at end of file
diff --git a/GoldC/pages/notice/components/table/index.js b/GoldC/pages/notice/components/table/index.js
new file mode 100644
index 0000000..5f96632
--- /dev/null
+++ b/GoldC/pages/notice/components/table/index.js
@@ -0,0 +1,109 @@
+Component({
+  data: {
+    headWidth: null, // 璁剧疆琛ㄦ牸鐨勬暣浣撳搴︼紝鐢ㄤ簬姘村钩婊氬姩
+    column: [], // 琛ㄥご鏍囬
+    config: { // 琛ㄦ牸鑷畾涔夋牱寮忚缃�
+      tableOutBorder: '', // 琛ㄦ牸鐨勮〃妗�
+      tableInBorder: '', // 琛ㄦ牸鐨勮〃妗�
+      tableInBorderLevel: false, // 琛ㄦ牸鍐呭彧鏄剧ず姘村钩杈规
+      tableRadius: '', // 琛ㄦ牸鍦嗚
+      theadHeight: '', // 琛ㄥご鐨勯珮搴�
+      theadAlign: '', // 琛ㄥご鐨勫瓧浣撳榻�
+      theadColor: '', // 琛ㄥご鐨勫瓧浣撻鑹�
+      theadBgColor: '', // 琛ㄥご鐨勮儗鏅壊
+      theadFontSize: '', // 琛ㄥご鐨勫瓧浣撳ぇ灏�
+      theadFontWeight: '', // 琛ㄥご鐨勫瓧浣撶矖缁�
+      tbodyHeight: '', // 琛ㄦ牸 tbody 鐨勯珮搴�, 鐢ㄤ簬鍨傜洿婊氬姩
+      tbodyAlign: '', // 琛ㄦ牸琛岀殑瀛椾綋瀵归綈鏂瑰紡
+      tbodyColor: '', // 琛ㄦ牸琛岀殑瀛椾綋棰滆壊
+      tbodyBgColor: '', // 琛ㄦ牸琛岀殑鑳屾櫙鑹�
+      tbodyFontSize: '', // 琛ㄦ牸琛岀殑瀛椾綋澶у皬
+      tbodyFontWeight: '', // 琛ㄦ牸琛岀殑瀛椾綋绮楃粏
+      trHeight: '', // 琛ㄦ牸琛� tr 鐨勯珮搴�
+      stripe: '' // 琛ㄦ牸鐨勬枒椹汗鑳屾櫙鑹�
+    }
+  },
+  properties: {
+    tabData: { // 鐖剁粍浠朵紶鍏ョ殑琛ㄦ牸鏁版嵁
+      type: Array,
+      value: []
+    },
+    columns: { // 鐖剁粍浠朵紶鍏ョ殑琛ㄥご鏍囬
+      type: Array,
+      value: []
+    },
+    setting: { // 鐖剁粍浠朵紶鍏ョ殑琛ㄦ牸鑷畾涔夋牱寮�
+      type: Object,
+      value: {}
+    }
+  },
+  observers: {
+    'tabData'(val) {
+      // console.log('tableData', val)
+    },
+    'columns'(val) {
+      if(val.length !== 0) {
+        let width = 0
+        let num = 0
+        val.forEach((item)=>{
+          // 鍒ゆ柇鏄惁璁剧疆浜嗗垪瀹斤紝娌℃湁鐨勮瘽璧嬪�奸粯璁ょ殑瀹藉害 186锛屽崟浣峳px
+          if(!!item.width) {
+            width += item.width/1
+          } else {
+            item.width = 186
+            width = width + 186
+          }
+          // 濡傛灉缁欏鍒楁坊鍔犱簡鐐瑰嚮浜嬩欢锛屽垯绗竴涓粦瀹氫簡鐐瑰嚮浜嬩欢鐨勫垪鐢熸晥
+          if(!!item.onclick && (item.onclick == true || item.onclick == 'true')) {
+            num++
+            if(num > 1) {
+              item.onclick = false
+            }
+          }
+        })
+        // 鍒ゆ柇table鐨勫搴︽槸鍚﹁秴鍑哄睆骞曠殑瀹藉害锛岃秴鍑哄垯璧嬪�煎浐瀹氱殑瀹藉害锛屽惁鍒欒祴鍊肩櫨鍒嗘瘮
+        if(width < 750) {
+          width = '100%'
+        } else {
+          width = width + 'rpx'
+        }
+        this.setData({
+          column: val,
+          headWidth: width
+        })
+      }
+    },
+    'setting'(val) {
+      // 鍒ゆ柇浼犲叆鐨勮〃鏍艰缃」鏄惁涓虹┖
+      if (Object.keys(val).length !== 0) {
+        for (let key in val) {
+          let str = null
+          if(key == 'tableInBorderLevel' && (val[key] == true || val[key] == 'true')) {
+            str = true
+          } else if(key == 'tableInBorderLevel') {
+            str = false
+          } else {
+            str = String(val[key]).replace(/(^\s*)|(\s*$)/g, '')
+          }
+          if(str != '' && str != null && str != 'null' && str != undefined && str != 'undefined') {
+            this.data.config[key] = str
+          }
+        }
+        this.setData({
+          config: this.data.config
+        })
+      }
+    }
+  },
+  methods: {
+    // 琛ㄦ牸鏌愯鐨勭偣鍑讳簨浠�
+    btnAction: function(e) {
+      let n = e.currentTarget.dataset.index.onclick
+      if(n == true|| n == 'true') {
+      let value = e.currentTarget.dataset.value // value锛氫竴涓寘鍚偣鍑昏鎵�鏈夋暟鎹殑瀵硅薄
+      this.triggerEvent("getCurrentValue", value)
+      }
+      },
+  }
+})
+
diff --git a/GoldC/pages/notice/components/table/index.json b/GoldC/pages/notice/components/table/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/GoldC/pages/notice/components/table/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/GoldC/pages/notice/components/table/index.wxml b/GoldC/pages/notice/components/table/index.wxml
new file mode 100644
index 0000000..42522ce
--- /dev/null
+++ b/GoldC/pages/notice/components/table/index.wxml
@@ -0,0 +1,42 @@
+<wxs src="./index.wxs" module="filter" />
+<view class="container">
+  <view class="table"
+        style="width:{{headWidth}};border-radius: {{config.tableRadius}}rpx;border:{{config.tableOutBorder}};border-bottom:{{config.tableOutBorder=='none'?(!!config.tableInBorder?config.tableInBorder:'2rpx solid #ebeef5'):''}};">
+    <view class="thead" style="min-height:{{config.theadHeight}}rpx;background:{{config.theadBgColor}};">
+      <view class="th"
+            wx:for="{{column}}"
+            wx:key="index"
+            style="flex-grow:0;flex-basis:{{headWidth=='100%'?(100/column.length)+'%':item.width+'rpx'}};color:{{config.theadColor}};font-size:{{config.theadFontSize}}rpx;font-weight:{{config.theadFontWeight}};border-right:{{index==(column.length - 1)?'none':(config.tableInBorderLevel?'none':config.tableInBorder)}};border-bottom:{{config.tableInBorder}};">
+        <view class="txt" style="text-align:{{config.theadAlign}};">{{item.label}}</view>
+      </view>
+    </view>
+    <!-- style="max-height:{{config.tbodyHeight}}rpx;" -->
+    <scroll-view scroll-y wx:if="{{tabData.length > 0}}" >
+      <view class="tr"
+            wx:for="{{tabData}}"
+            wx:for-item="item"
+            wx:key="index"
+            style="min-height:{{config.trHeight}}rpx;background:{{config.tbodyBgColor}};">
+        <view class="td"
+              wx:for="{{column}}"
+              wx:for-item="col"
+              wx:for-index="colIndex"
+              wx:key="colIndex"
+              style="flex-grow:0;flex-basis:{{headWidth=='100%'?(100/column.length)+'%':col.width+'rpx'}};background:{{index%2!=0?config.stripe:''}};color:{{config.tbodyColor}};font-size:{{config.tbodyFontSize}}rpx;font-weight:{{config.tbodyFontWeight}};border-right:{{colIndex==(column.length - 1)?'none':(config.tableInBorderLevel?'none':config.tableInBorder)}};border-bottom:{{index==tabData.length-1?'none':config.tableInBorder}};">
+          <view class="txt"
+          		data-value="{{item}}"
+              bindtap="btnAction" data-index="{{col}}"
+          		style="text-align:{{config.tbodyAlign}};font-size:{{col.fontSize}}rpx;font-weight:{{col.fontWeight}};text-decoration:{{col.textDecoration}};color:{{col.color}};">
+            <block wx:if="{{!!col.type}}">{{filter[col.type](item[col.prop], col.param)}}</block>
+            <block wx:else>{{item[col.prop]}}</block>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <view wx:if="{{tabData.length === 0}}" class="msg">
+      <view>鏆傛棤鏁版嵁~</view>
+    </view>
+  </view>
+</view>
+
+
diff --git a/GoldC/pages/notice/components/table/index.wxs b/GoldC/pages/notice/components/table/index.wxs
new file mode 100644
index 0000000..41b8157
--- /dev/null
+++ b/GoldC/pages/notice/components/table/index.wxs
@@ -0,0 +1,119 @@
+// 鏍煎紡鍖栨椂闂�
+function time(val, option) {
+  var date = getDate(val)
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1
+  var day = date.getDate()
+  var week = date.getDay()
+  var hour = date.getHours()
+  var minute = date.getMinutes()
+  var second = date.getSeconds()
+  
+  //鑾峰彇 骞存湀鏃�
+  if (option == 'YY-MM-DD') return [year, month, day].map(formatNumber).join('-')
+
+  //鑾峰彇 骞存湀
+  if (option == 'YY-MM') return [year, month].map(formatNumber).join('-')
+
+  //鑾峰彇 骞�
+  if (option == 'YY') return [year].map(formatNumber).toString()
+
+  //鑾峰彇 鏈�
+  if (option == 'MM') return  [mont].map(formatNumber).toString()
+
+  //鑾峰彇 鏃�
+  if (option == 'DD') return [day].map(formatNumber).toString()
+
+  //鑾峰彇 骞存湀鏃� 鍛ㄤ竴 鑷� 鍛ㄦ棩
+  if (option == 'YY-MM-DD Week')  return [year, month, day].map(formatNumber).join('-') + ' ' + getWeek(week)
+
+  //鑾峰彇 鏈堟棩 鍛ㄤ竴 鑷� 鍛ㄦ棩
+  if (option == 'MM-DD Week')  return [month, day].map(formatNumber).join('-') + ' ' + getWeek(week)
+
+  //鑾峰彇 鍛ㄤ竴 鑷� 鍛ㄦ棩
+  if (option == 'Week')  return getWeek(week)
+
+  //鑾峰彇 鏃跺垎绉�
+  if (option == 'hh-mm-ss') return [hour, minute, second].map(formatNumber).join(':')
+
+  //鑾峰彇 鏃跺垎
+  if (option == 'hh-mm') return [hour, minute].map(formatNumber).join(':')
+
+  //鑾峰彇 鍒嗙
+  if (option == 'mm-dd') return [minute, second].map(formatNumber).join(':')
+
+  //鑾峰彇 鏃�
+  if (option == 'hh')  return [hour].map(formatNumber).toString()
+
+  //鑾峰彇 鍒�
+  if (option == 'mm')  return [minute].map(formatNumber).toString()
+
+  //鑾峰彇 绉�
+  if (option == 'ss') return [second].map(formatNumber).toString()
+
+  //榛樿 骞存湀鏃� 鏃跺垎绉� 
+  return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+}
+
+function formatNumber(n) {
+  n = n.toString()
+  return n[1] ? n : '0' + n
+}
+
+function getWeek(n) {
+  switch(n) {
+    case 1:
+      return '鏄熸湡涓�'
+    case 2:
+      return '鏄熸湡浜�'
+    case 3:
+      return '鏄熸湡涓�'
+    case 4:
+      return '鏄熸湡鍥�'
+    case 5:
+      return '鏄熸湡浜�'
+    case 6:
+      return '鏄熸湡鍏�'
+    case 7:
+      return '鏄熸湡鏃�'
+  }
+}
+// 鏍煎紡鍖栦环鏍�
+function price(val, option) {
+  var option = option || 0
+   // 涓嶆槸鏁板瓧杩斿洖绌�
+   if(val != null && val != '' && isNaN(val/1)) {
+    return ''
+  }
+  if(!!val && val != 'null' && val != 'undefined') {
+    return val.toFixed(option)
+  }
+  return ''
+}
+// 鏍煎紡鍖栫櫨鍒嗘瘮
+function percent(val) {
+  // 涓嶆槸鏁板瓧杩斿洖绌�
+  if(val != null && val != '' && isNaN(val/1)) {
+    return ''
+  }
+  // 濡傛灉鍊煎皬浜庝竾鍒嗕綅锛堝皬浜� 0.01%锛夊垯杩斿洖 0%
+  if(val < 0.0001) {
+    return '0%'
+  }
+  // 灏忔暟 *100 鍚庝笉鍖呭惈灏忔暟鐐癸紝杩斿洖 *100 鍚庣殑缁撴灉
+  if(val >= 0.0001 && ((val * 100) + '').indexOf('.') == -1) {
+    return (val * 100) + '%'
+  }
+  // 鏈変簺灏忔暟 *100 涔嬪悗浼氬嚭鐜板緢闀跨殑浣嶆暟锛屾瘮濡�0.07*100=0.000000000001
+  // 鍏堝鐞嗘垚鏁扮粍鍐嶆埅鍙� arr[1] 鐨勫墠涓や釜瀛楃鍒ゆ柇鏄惁绛変簬0锛岀瓑浜� 0 杩斿洖 arr[0]锛屼笉绛変簬 0 鍒欎繚鐣欎袱浣嶅皬鏁�
+  if(val >= 0.0001 && ((val * 100) + '').indexOf('.') > -1) {
+    if((val * 100 + '').split('.')[1].slice(0,2) == 0){
+      return (val * 100 + '').split('.')[0] + '%'
+    }
+    return (val * 100).toFixed(2) / 1 + '%'
+  }
+}
+
+module.exports.time = time;
+module.exports.price = price;
+module.exports.percent = percent;
diff --git a/GoldC/pages/notice/components/table/index.wxss b/GoldC/pages/notice/components/table/index.wxss
new file mode 100644
index 0000000..6b90891
--- /dev/null
+++ b/GoldC/pages/notice/components/table/index.wxss
@@ -0,0 +1,56 @@
+/* pages/notice/components/index.wxss */
+.container {
+  overflow-x: scroll;
+}
+.table {
+  border: 2rpx solid #ebeef5;
+  border-bottom: 2rpx solid #ebeef5;
+  border-radius: 0;
+  box-sizing: border-box;
+  background: #fff;
+  font-size: 24rpx;
+  color: #606266;
+  overflow: hidden;
+}
+/* 琛ㄥご */
+.thead {
+  display: flex;
+}
+.th {
+  padding: 10rpx 20rpx;
+  border-right: 2rpx solid #ebeef5;
+  border-bottom: 2rpx solid #ebeef5;
+  display: flex;
+  align-items: center;
+}
+.th .txt {
+  font-weight: bold;
+  text-align: left;
+}
+.tr {
+  display: flex;
+}
+.td {
+  padding: 10rpx 20rpx;
+  border-right: 2rpx solid #ebeef5;
+  border-bottom: 2rpx solid #ebeef5;
+  display: flex;
+  align-items: center;
+}
+.td .txt {
+  text-align: left;
+  font-weight: normal;
+}
+.msg {
+  width: 750rpx;
+  height: 240rpx;
+  line-height: 240rpx;
+  font-size: 26rpx;
+  text-align: center;
+}
+/* 闅愯棌琛ㄦ牸婊氬姩鏉� */
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+}
diff --git a/GoldC/pages/notice/notice.js b/GoldC/pages/notice/notice.js
new file mode 100644
index 0000000..99ea00c
--- /dev/null
+++ b/GoldC/pages/notice/notice.js
@@ -0,0 +1,123 @@
+Page({
+  data: {
+    active: 0,
+    page: 1,
+    pageTotal: 0,
+    show: false,
+    // 琛ㄦ牸鏁版嵁
+    tabData: [],
+    // 琛ㄦ牸鏍囬鍒�
+    columns: [
+      { label: '鍏憡鏍囬', prop: 'noticeTitle', fontSize: '', fontWeight: 600, color: '#000' },
+      // { label: '鍏憡绫诲瀷', prop: 'noticeType' },
+      { label: '鍒涘缓鏃堕棿', prop: 'createTime' },
+      { label: '鎿嶄綔', prop: 'action', fontSize: '', fontWeight: 400, textDecoration: '', color: '#1890FF', onclick: true, },
+      // { label: '涓婃灦鏃堕棿', prop: 'shelveTime', type: 'time', param: 'YY-MM-DD'}
+    ],
+    // 鑷畾涔夋牱寮忛厤缃」
+    setting: {
+      tableRadius: 0, // 琛ㄦ牸鍦嗚
+      tableOutBorder: '', // 琛ㄦ牸澶栬竟妗�
+      tableInBorder: '', // 琛ㄦ牸鍐呰竟妗�
+      tableInBorderLevel: 'true', // 琛ㄦ牸鍐呭彧鏄剧ず姘村钩杈规
+      theadHeight: 70, // 琛ㄥご鐨勯珮搴�
+      theadAlign: '', // 琛ㄥご鐨勫瓧浣撳榻愭柟寮�
+      theadColor: '', // 琛ㄥご鐨勫瓧浣撻鑹�
+      theadBgColor: '', // 琛ㄥご鐨勮儗鏅壊
+      theadFontSize: '', // 琛ㄥご鐨勫瓧浣撳ぇ灏�
+      theadFontWeight: '', // 琛ㄥご鐨勫瓧浣撶矖缁�
+      tbodyHeight: '600',  // 琛ㄦ牸 tbody 鐨勯珮搴�, 鐢ㄤ簬鍨傜洿婊氬姩
+      tbodyAlign: '', // 琛ㄦ牸琛岀殑鐨勫瓧浣撳榻愭柟寮�
+      tbodyColor: '', // 琛ㄦ牸琛岀殑瀛椾綋棰滆壊
+      tbodyBgColor: '', // 琛ㄦ牸琛岀殑鑳屾櫙鑹�
+      tbodyFontSize: '', // 琛ㄦ牸琛岀殑瀛椾綋澶у皬
+      tbodyFontWeight: '', // 琛ㄦ牸琛岀殑瀛椾綋绮楃粏
+      trHeight: 70, // 琛ㄦ牸琛� tr 鐨勯珮搴�
+      stripe: '#fdf5e6' // #fafafa #f5f5f5 #fdf5e6 #fff8dc #f0f9eb
+    }
+  },
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad: function (options) {
+    this.getList()
+  },
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow: function () {
+    this.getList()
+  },
+  onChangeactive(e) {
+    this.setData({
+      active: e.detail.index,
+      page: 1,
+    })
+    this.getList()
+  },
+  onChange() { },
+  getList() {
+    let that = this
+    let data = {
+      pageNum: this.data.page,
+      pageSize: 10,
+      noticeType: this.data.active + 1
+    }
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/system/notice/list',
+      method: 'GET',
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      data: data,
+      success(res) {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          let arr = res.data.rows
+          for (let i = 0; i < arr.length; i++) {
+            let a = arr[i].createTime.split(' ')
+            arr[i].id = i + 1
+            arr[i].createTime = a[0]
+            arr[i].action = '鏌ョ湅'
+            if (arr[i].noticeType == 1) {
+              arr[i].noticeType = '閫氱煡'
+            }
+            if (arr[i].noticeType == 2) {
+              arr[i].noticeType = '鍏憡'
+            }
+          }
+          let total = Math.ceil(res.data.total / 10)
+          that.setData({
+            tabData: arr,
+            pageTotal: total,
+          })
+          console.log(that.data.pageTotal, that.data.show);
+        }
+
+      }
+    })
+
+  },
+  pagChange(e) {
+    console.log(e);
+    this.setData({
+      page: e.detail.currentIndex
+    })
+    this.getList()
+
+  },
+  // 琛ㄦ牸鐨勮嚜瀹氫箟鐐瑰嚮浜嬩欢
+  getCurrentValue(e) {
+
+    console.log(e, e.detail.id);
+    wx.setStorageSync('noticeId', e.detail.noticeId)
+    wx.navigateTo({
+      url: '/pages/noticeDetail/noticeDetail',
+    })
+  }
+})
diff --git a/GoldC/pages/notice/notice.json b/GoldC/pages/notice/notice.json
new file mode 100644
index 0000000..98d630c
--- /dev/null
+++ b/GoldC/pages/notice/notice.json
@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+   "table":"./components/table/index",
+   "paging":"./components/page/index",
+   "van-tab":"/miniprogram_npm/vant-weapp/tab/index",
+   "van-tabs":"/miniprogram_npm/vant-weapp/tabs/index"
+
+  },
+  "navigationBarTitleText": "绯荤粺娑堟伅",
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#1E90FF"
+}
\ No newline at end of file
diff --git a/GoldC/pages/notice/notice.wxml b/GoldC/pages/notice/notice.wxml
new file mode 100644
index 0000000..358d46f
--- /dev/null
+++ b/GoldC/pages/notice/notice.wxml
@@ -0,0 +1,15 @@
+<van-tabs active="{{ active }}" bind:change="onChangeactive" style="width:90%">
+    <van-tab title="閫氱煡"></van-tab>
+    <van-tab title="鍏憡"></van-tab>
+</van-tabs>
+
+
+<view class="container">
+  <view class="table">
+    <table tabData="{{tabData}}" columns="{{columns}}" setting="{{setting}}" bind:getCurrentValue="getCurrentValue">
+    </table>
+  </view>
+</view>
+<view wx:if="show">
+  <paging current-index="{{page}}" total-page="{{pageTotal}}" bind:pagingChange="pagChange"></paging>
+</view>
\ No newline at end of file
diff --git a/GoldC/pages/notice/notice.wxss b/GoldC/pages/notice/notice.wxss
new file mode 100644
index 0000000..f1655be
--- /dev/null
+++ b/GoldC/pages/notice/notice.wxss
@@ -0,0 +1,15 @@
+/* pages/notice/notice.wxss */
+page {
+  background: #fff;
+}
+.container {
+  width: 100%;
+  padding: 20px 0;
+}
+.table {
+  width: 100%;
+  margin: 0 auto 10rpx;
+}
+.van-tabs__line {
+  background-color: #1E90FF !important;
+}
diff --git a/GoldC/pages/noticeDetail/noticeDetail.js b/GoldC/pages/noticeDetail/noticeDetail.js
new file mode 100644
index 0000000..26ed7c9
--- /dev/null
+++ b/GoldC/pages/noticeDetail/noticeDetail.js
@@ -0,0 +1,104 @@
+// pages/noticeDetail/noticeDetail.js
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    detail: {}
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad(options) {
+
+
+  },
+  getNotice() {
+    let that = this
+    let id = wx.getStorageSync('noticeId')
+    console.log(id);
+    wx.request({
+      url: `https://puyue.yhupai.com/prod-api/system/notice/${id}`,
+      method: 'GET',
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      // data: data,
+      success(res) {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          let obj = res.data.data
+
+          if (obj.noticeType == 1) {
+            obj.noticeType = '閫氱煡'
+          }
+          if (obj.noticeType == 2) {
+            obj.noticeType = '鍏憡'
+          }
+          that.setData({
+            detail: obj,
+          })
+          // console.log(that.data.detail);
+        }
+      }
+    })
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow() {
+    this.getNotice()
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/GoldC/pages/noticeDetail/noticeDetail.json b/GoldC/pages/noticeDetail/noticeDetail.json
new file mode 100644
index 0000000..1547576
--- /dev/null
+++ b/GoldC/pages/noticeDetail/noticeDetail.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "绯荤粺娑堟伅璇︽儏",
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#1E90FF"
+
+}
\ No newline at end of file
diff --git a/GoldC/pages/noticeDetail/noticeDetail.wxml b/GoldC/pages/noticeDetail/noticeDetail.wxml
new file mode 100644
index 0000000..d8247b6
--- /dev/null
+++ b/GoldC/pages/noticeDetail/noticeDetail.wxml
@@ -0,0 +1,18 @@
+<!--pages/noticeDetail/noticeDetail.wxml-->
+<view class="title">{{detail.noticeTitle}}</view>
+<view style="display: flex;height: 30px;line-height: 30px;padding-left: 10px;text-align: center;">
+  <view class="noticeType2" wx:if="{{detail.noticeType=='鍏憡'}}">
+    {{detail.noticeType}}
+  </view>
+  <view class="noticeType1" wx:if="{{detail.noticeType=='閫氱煡'}}">
+    {{detail.noticeType}}
+  </view>
+  <view>
+    {{detail.createTime}}
+  </view>
+</view>
+<view style="margin-top:10px;padding:10px;">
+
+
+  <rich-text nodes="{{detail.noticeContent}}" />
+</view>
\ No newline at end of file
diff --git a/GoldC/pages/noticeDetail/noticeDetail.wxss b/GoldC/pages/noticeDetail/noticeDetail.wxss
new file mode 100644
index 0000000..e29f4c6
--- /dev/null
+++ b/GoldC/pages/noticeDetail/noticeDetail.wxss
@@ -0,0 +1,29 @@
+/* pages/noticeDetail/noticeDetail.wxss */
+
+.title {
+  height: 30px;
+  line-height: 30px;
+  margin: 10px 20px;
+  font-size: 20px;
+  text-align: center;
+  padding: 0;
+}
+
+.noticeType1 {
+  width: 50px;
+  height: 30px;
+  background-color: #FFBA00;
+  border-color: #FFBA00;
+  color: #fff;
+  text-align: center;
+  margin-right: 10px;
+}
+.noticeType2 {
+  width: 50px;
+  height: 30px;
+  background-color: #1890FF;
+ 
+  color: #fff;
+  text-align: center;
+  margin-right: 10px;
+}
\ No newline at end of file
diff --git a/GoldC/pages/person/person.js b/GoldC/pages/person/person.js
index bc1fd98..3d727f2 100644
--- a/GoldC/pages/person/person.js
+++ b/GoldC/pages/person/person.js
@@ -13,17 +13,22 @@
     username: '',
     part: '',
     show: false,
-    phone:''
+    phone:'',
+    imgHeader: '/images/heard.png'
+
   },
+
+ 
   openDialog() {
     this.setData({
       show: true
     })
   },
-  options: {
-    styleIsolation: 'shared'
-  },
   goPersonSet(){
+    console.log(1);
+    // wx.navigateTo({
+    //   url: '/pages/personSet/personSet',
+    // })
     wx.navigateTo({
       url: '/pages/personSet/personSet',
     })
@@ -71,9 +76,7 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow: function () {
-    // console.log(app);
     this.getUser()
-   
   },
   getUser() {
     wx.request({
@@ -92,11 +95,13 @@
           console.log(res.data.data);
           this.setData({
             username: res.data.data.nickName,
-            // part: app.part,
-            headUrl: app.headUrl,
-            // show: false,
             phone:res.data.data.phonenumber
           })
+          if(res.data.data.avatar){
+            this.setData({
+              imgHeader:'https://puyue.yhupai.com/prod-api/'+res.data.data.avatar
+            })
+          }
         }
       },
     });
diff --git a/GoldC/pages/person/person.wxml b/GoldC/pages/person/person.wxml
index b8d92fb..a487f47 100644
--- a/GoldC/pages/person/person.wxml
+++ b/GoldC/pages/person/person.wxml
@@ -19,7 +19,7 @@
 </view> -->
 
 <view class="header">
-  <image class="hImg" src="{{headUrl}}" mode="" />
+  <image class="hImg" src="{{imgHeader}}" mode="" />
   <view>
     <view style="font-size: 18px;">{{username}}</view>
     <view>{{phone}}</view>
@@ -31,7 +31,7 @@
     <view class="text"><image src="/images/me.png" mode=""/> 涓汉璁剧疆</view>
     <text class="iconfont icon-xiangyoujiantou"></text>
   </view>
-  <view class="item">
+  <view class="item" bind:tap="gonotice">
     <view class="text"><image src="/images/xtnews.png" mode=""/> 绯荤粺娑堟伅</view>
     <text class="iconfont icon-xiangyoujiantou"></text>
   </view>
diff --git a/GoldC/pages/person/person.wxss b/GoldC/pages/person/person.wxss
index 834c5fc..c7bcb2b 100644
--- a/GoldC/pages/person/person.wxss
+++ b/GoldC/pages/person/person.wxss
@@ -94,11 +94,12 @@
   margin: 10px 0;
   display: flex;
 }
+
 .header image {
   width: 80px;
   height: 80px;
   border-radius: 50%;
-  padding-top: 10px;
+  margin-top: 10px;
   margin-left: 10px;
 }
 .header view {
diff --git a/GoldC/pages/personSet/personSet.js b/GoldC/pages/personSet/personSet.js
index 8e5f6e8..634d7ff 100644
--- a/GoldC/pages/personSet/personSet.js
+++ b/GoldC/pages/personSet/personSet.js
@@ -7,8 +7,8 @@
    */
   data: {
     personInfo: {},
-    
-
+    isAuth: false,
+    imgHeader: '/images/heard.png'
   },
   getUser() {
     wx.request({
@@ -22,12 +22,20 @@
       success: (res, header) => {
         // console.log(res);
         if (res.data.code != 200) {
-
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
         } else {
-          console.log(res.data.data);
+          let data=res.data.data
           this.setData({
-            personInfo: res.data.data
+            personInfo: data,
           })
+          if(this.data.personInfo.avatar){
+            this.setData({
+              imgHeader:'https://puyue.yhupai.com/prod-api/'+this.data.personInfo.avatar
+            })
+          }
         }
       },
     });
@@ -39,27 +47,65 @@
       url: '/pages/changePsw/changePSW',
     })
   },
- 
   chooseimage() {
-    var _this = this;
+    var that = this; // 灏嗗綋鍓嶉〉闈㈢殑涓婁笅鏂囪祴鍊肩粰 that 鍙橀噺
+    // 鍦ㄦ煇涓簨浠跺鐞嗗嚱鏁颁腑璋冪敤浠ヤ笅浠g爜
     wx.chooseImage({
-      count: 1, // 榛樿9  
-      sizeType: ['original', 'compressed'], // 鍙互鎸囧畾鏄師鍥捐繕鏄帇缂╁浘锛岄粯璁や簩鑰呴兘鏈�  
-      sourceType: ['album', 'camera'], // 鍙互鎸囧畾鏉ユ簮鏄浉鍐岃繕鏄浉鏈猴紝榛樿浜岃�呴兘鏈�  
+      count: 1, // 鏈�澶氬彲浠ラ�夋嫨鐨勫浘鐗囨暟閲忥紝杩欓噷璁句负1
+      sourceType: ['album'], // 浠庣浉鍐岄�夋嫨
       success: function (res) {
-        // 杩斿洖閫夊畾鐓х墖鐨勬湰鍦版枃浠惰矾寰勫垪琛紝tempFilePath鍙互浣滀负img鏍囩鐨剆rc灞炴�ф樉绀哄浘鐗�  
-        _this.setData({
-          tempFilePaths: res.tempFilePaths
-        })
+        // 閫夋嫨鎴愬姛鍚庯紝res.tempFilePaths 鏄�夊畾鐨勫浘鐗囩殑鏈湴鏂囦欢璺緞鍒楄〃
+        const tempFilePath = res.tempFilePaths;
+        wx.compressImage({
+          src: tempFilePath[0],
+          quality: 80, // 璁剧疆鍘嬬缉璐ㄩ噺锛岃寖鍥翠负 0-100
+          success: function (res) {
+            const compressedFilePath = res.tempFilePath;
+            console.log(compressedFilePath, 'compressedFilePath');
+            // 鍘嬬缉鍚庣殑鍥剧墖璺緞杩涜鐨勫悗缁搷浣�
+            try {
+              // const userinfo = wx.getStorageSync('userinfo')
+              let data = compressedFilePath
+              wx.uploadFile({
+                // 涓婁紶鎺ュ彛璺緞
+                url: `https://puyue.yhupai.com/prod-api/system/user/profile/avatar`,
+                filePath: data,
+                name: 'avatarfile', // 涓婁紶鏂囦欢瀵瑰簲鐨� key 鍚嶇О
+                method: 'post',
+                header: {
+                  'content-type': 'application/form-data',
+                  "Access-Control-Allow-Headers": 'token',
+                  Authorization: `Bearer ${wx.getStorageSync('token')}`
+                },
+                // data: data
+                success: function (res) {
+                  that.getUser()
+                  // // 涓婁紶鎴愬姛鍚庣殑澶勭悊閫昏緫
+                  // that.setData({
+                  //   imageSrc: JSON.parse(res.data).msg // 灏嗛�夋嫨鐨勫浘鐗囪矾寰勮缃负椤甸潰鏁版嵁鐨勬煇涓睘鎬�
+                  // });
+                },
+                fail: function (res) {
+                  // 涓婁紶澶辫触鍚庣殑澶勭悊閫昏緫
+                  console.log(res, '涓婁紶澶辫触鍚庣殑澶勭悊閫昏緫');
+                }
+              })
+            } catch (e) { }
+
+          },
+          fail: function (err) {
+            // 鍘嬬缉澶辫触鐨勫鐞�
+            console.error(err);
+          }
+        });
       }
-    })
+    });
   },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
     this.getUser()
-    // console.log(app);
 
   },
 
diff --git a/GoldC/pages/personSet/personSet.wxml b/GoldC/pages/personSet/personSet.wxml
index 4c482f0..da37f22 100644
--- a/GoldC/pages/personSet/personSet.wxml
+++ b/GoldC/pages/personSet/personSet.wxml
@@ -5,9 +5,10 @@
       鐢ㄦ埛澶村儚
     </view>
     <view style="height: 80px;line-height:80px;display: flex;" bindtap="chooseimage">
-      <image src="/images/heard.png" mode="" />
+      <image class="imgHeader" src="{{imgHeader}}" mode="" />
       <text class="iconfont icon-xiangyoujiantou"></text>
     </view>
+    <camera wx:if="{{isAuth}}" device-position="back" flash="off" binderror="error"></camera>
 
   </view>
   <view class="item">
diff --git a/GoldC/pages/personSet/personSet.wxss b/GoldC/pages/personSet/personSet.wxss
index 76b84f0..1d1e962 100644
--- a/GoldC/pages/personSet/personSet.wxss
+++ b/GoldC/pages/personSet/personSet.wxss
@@ -1,4 +1,7 @@
 /* pages/personSet/personSet.wxss */
+.imgHeader{
+  border-radius: 50%;
+}
 .list .item {
   width: 100%;
   height: 50px;
@@ -34,7 +37,6 @@
   padding: 0;
 }
 .van-dialog__button {
- 
   flex: 1;
   width: 50%;
   margin: 0 auto;
diff --git a/GoldC/pages/reg/reg.js b/GoldC/pages/reg/reg.js
index ec1bb30..4fe0555 100644
--- a/GoldC/pages/reg/reg.js
+++ b/GoldC/pages/reg/reg.js
@@ -7,28 +7,30 @@
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
-    phone:'',
+    phone: '',
     psw: '',
+    psw2: '',
     codeNum: '',
     userName: '',
-    tjCode:'0',
+    tjCode: '',
     imgSrc: '',
-    address:'',
-    detailedaddress:'',
-    radio:true,
+    address: '',
+    detailedaddress: '',
+    checked: false,
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad: function (options) {
+    this.getImg()
     if (wx.getStorageSync('user')) {
       app.setUser(wx.getStorageSync('user'))
       wx.switchTab({
         url: '/pages/home/home',
       })
     }
-    this.getImg()
+
   },
   // 缁戝畾鐢ㄦ埛鍚�
   bindUserName(e) {
@@ -36,10 +38,20 @@
       userName: e.detail.value
     })
   },
+  bindPhone(e) {
+    this.setData({
+      phone: e.detail.value
+    })
+  },
   // 缁戝畾瀵嗙爜
   bindPSW(e) {
     this.setData({
       psw: e.detail.value
+    })
+  },
+  bindPSW2(e) {
+    this.setData({
+      psw2: e.detail.value
     })
   },
   // 楠岃瘉鐮�
@@ -53,43 +65,48 @@
       tjCode: e.detail.value
     })
   },
-
+  onChangeRadio(e) {
+    // console.log(e);
+    if(e.detail.value.length>0){
+      this.setData({
+        checked:true
+      })
+    }else{
+      this.setData({
+        checked:false
+      })
+    }
+   
+  },
   // 楠岃瘉鐮�
   getImg() {
     this.setData({
-      imgSrc: ""
-    })
-    this.setData({
+      imgSrc: "",
       uuid: ""
     })
     wx.request({
-      url: `http://39.105.187.20/prod-api/captchaImage`,
+      url: `https://puyue.yhupai.com/prod-api/captchaImage`,
       method: 'GET',
-      header: {
-        "Access-Control-Allow-Headers": 'token'
-      },
+      // header: {
+      //   "Access-Control-Allow-Headers": 'token'
+      // },
       dataType: 'json',
       success: (res, header) => {
-        // console.log(res);
         if (res.data.code != 200) {
-          wx.showToast({
-            title: res.data.msg,
-            icon: 'none'
-          });
+          // wx.showToast({
+          //   title: res.data.msg,
+          //   icon: 'none'
+          // });
+          this.getImg()
         } else {
+          console.log(res);
           this.setData({
             imgSrc: "data:image/gif;base64," + res.data.img,
-            uuid: res.data.uuid
+            uuid: res.data.uuid,
           })
-          // this.imgSrc = "data:image/gif;base64," + res.data.img
-          // this.login.uuid = res.data.uuid
-          // console.log(this.imgSrc);
         }
       },
-
     });
-
-
   },
   choseLocation() {
     wx.chooseLocation({
@@ -144,6 +161,102 @@
       }
     })
   },
+  login() {
+    let reg_user = /^[\u4e00-\u9fa5]{2,4}$/;    //2-4涓腑鏂囧瓧绗︽鍒�
+    let reg_tel = /^1(3|4|5|6|7|8|9)\d{9}$/;
+    if (!reg_user.test(this.data.userName)) {
+      wx.showToast({
+        title: '璇疯緭鍏ョ湡瀹炲鍚�',
+        icon: 'none'
+      });
+      return false
+    } else if (!reg_tel.test(this.data.phone)) {
+      wx.showToast({
+        title: '璇疯緭鍏ユ墜鏈哄彿',
+        icon: 'none'
+      });
+      return false
+    } else if (!this.data.codeNum) {
+      wx.showToast({
+        title: '璇疯緭鍏ラ獙璇佺爜',
+        icon: 'none'
+      });
+      return false
+    } else if (!this.data.psw) {
+      wx.showToast({
+        title: '璇疯緭鍏ュ瘑鐮�',
+        icon: 'none'
+      });
+      return false
+    } else if (!this.data.psw2) {
+      wx.showToast({
+        title: '璇疯緭鍏ョ‘璁ゅ瘑鐮�',
+        icon: 'none'
+      });
+      return false
+    } else if (this.data.psw2 !== this.data.psw) {
+      wx.showToast({
+        title: '涓ゆ瀵嗙爜涓嶄竴鑷�',
+        icon: 'none'
+      });
+      return false
+    } else if (!this.data.detailedaddress) {
+      wx.showToast({
+        title: '璇烽�夋嫨鍦板潃',
+        icon: 'none'
+      });
+      return false
+    }else if(!this.checked){
+      wx.showToast({
+        title: '璇烽槄璇诲苟鍚屾剰鐢ㄦ埛鍗忚',
+        icon: 'none'
+      });
+      return false
+    }
+
+    let data = {
+      bindId: '',
+      username: this.data.userName,
+      phonenumber: this.data.phone,
+      code: this.data.codeNum,
+      confirmPassword: this.data.psw2,
+      password: this.data.psw,
+      uuid: this.data.uuid,
+      advisecode: this.data.tjCode,
+      address: this.data.detailedaddress
+    }
+    wx.request({
+      url: `https://puyue.yhupai.com/prod-api/iot/tool/register`,
+      method: 'POST',
+      header: {
+        "Access-Control-Allow-Headers": 'token'
+      },
+      data: data,
+
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+          this.getImg()
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+          setTimeout(() => {
+            wx.navigateTo({
+              url: '/pages/login/login',
+            })
+          }, 2000);
+
+        }
+      },
+
+    });
+
+  },
 
 
   /**
@@ -157,9 +270,7 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow: function () {
-
   },
-
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
    */
diff --git a/GoldC/pages/reg/reg.json b/GoldC/pages/reg/reg.json
index 7b0db14..b36561c 100644
--- a/GoldC/pages/reg/reg.json
+++ b/GoldC/pages/reg/reg.json
@@ -1,5 +1,8 @@
 {
-  "usingComponents": {},
+  "usingComponents": {
+    "van-checkbox": "/miniprogram_npm/vant-weapp/checkbox/index",
+    "van-checkbox-group": "/miniprogram_npm/vant-weapp/checkbox-group/index"
+  },
   "navigationBarTitleText": "娉ㄥ唽璐︽埛",
   "navigationBarTextStyle": "white",
   "navigationBarBackgroundColor": "#007CFE"
diff --git a/GoldC/pages/reg/reg.wxml b/GoldC/pages/reg/reg.wxml
index 6df2ab0..7c4e097 100644
--- a/GoldC/pages/reg/reg.wxml
+++ b/GoldC/pages/reg/reg.wxml
@@ -5,11 +5,11 @@
 <view style="width:100%">
   <view class="loginBox">
     <view class="inpicon">
-      <input class="input" password="true" placeholder="璇疯緭鍏ョ湡瀹炲鍚�" bindinput="bindPSW"></input>
+      <input class="input" value="{{userName}}" placeholder="璇疯緭鍏ョ湡瀹炲鍚�" bindinput="bindUserName"></input>
       <image class="icon" src="/images/psw.png"></image>
     </view>
     <view class="inpicon">
-      <input class="input" placeholder="璇疯緭鍏ユ墜鏈哄彿" bindinput="bindUserName"></input>
+      <input class="input" value="{{phone}}" type="phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" bindinput="bindPhone"></input>
       <image class="icon" src="/images/user.png"></image>
     </view>
     <view style="display: flex;justify-content: space-between;margin-bottom: 10px;width: 95%;padding:0 10px 0 10px;">
@@ -17,11 +17,11 @@
       <image style="width: 30%;height: 40px;" bindtap="getImg" src="{{imgSrc}}"></image>
     </view>
     <view class="inpicon">
-      <input class="input" password="true" placeholder="璇疯緭鍏ュ瘑鐮�" bindinput="bindPSW"></input>
+      <input class="input" value="{{psw}}" password="true" placeholder="璇疯緭鍏ュ瘑鐮�" bindinput="bindPSW"></input>
       <image class="icon" src="/images/psw.png"></image>
     </view>
     <view class="inpicon">
-      <input class="input" password="true" placeholder="璇疯緭鍏ョ‘璁ゅ瘑鐮�" bindinput="bindPSW"></input>
+      <input class="input" value="{{psw2}}" password="true" placeholder="璇疯緭鍏ョ‘璁ゅ瘑鐮�" bindinput="bindPSW2"></input>
       <image class="icon" src="/images/psw.png"></image>
     </view>
     <view>
@@ -40,9 +40,24 @@
     </view>
     <button class="reg" bindtap="login">娉ㄥ唽</button>
     <navigator url="/pages/login/login" style="text-align: center;color: #1E90FF;">宸叉湁璐﹀彿锛岀洿鎺ョ櫥褰�</navigator>
-    <view style="text-align: center;">
-      <radio value="{{radio}}" style="transform:scale(0.7);" />
+    <!-- <view style="text-align: center;">
+      <radio value="{{radio}}" bind:change="onChangeRadio" style="transform:scale(0.7);" />
+      <van-checkbox value="{{ checked }}" bind:change="onChangeRadio"></van-checkbox>
       <text style="color: #1E90FF;">鍚屾剰鐢ㄦ埛鍗忚</text>
+    </view> -->
+    <!-- <view class="page-section page-section-gap" style="text-align: center;">
+      <label class="checkbox">
+        <checkbox value="cb" checked="{{checked}}" bind:change="onChangeRadio" /> <text style="color: #1E90FF;">鍚屾剰鐢ㄦ埛鍗忚</text>
+      </label>
+    </view> -->
+    <view style="width: 125px;margin: 0 auto;">
+      <checkbox-group bindchange="onChangeRadio" >
+        <label style="display: flex;text-align: center;">
+          <checkbox value="cb" checked="{{checked}}"  />
+          <view style="color: #1E90FF;">鍚屾剰鐢ㄦ埛鍗忚</view>
+        </label>
+      </checkbox-group>
     </view>
+
   </view>
 </view>
\ No newline at end of file
diff --git a/GoldC/pages/repairTicketDetail/repairTicketDetail.js b/GoldC/pages/repairTicketDetail/repairTicketDetail.js
index 15b8c60..3fd542e 100644
--- a/GoldC/pages/repairTicketDetail/repairTicketDetail.js
+++ b/GoldC/pages/repairTicketDetail/repairTicketDetail.js
@@ -1,29 +1,37 @@
 // pages/repairTicketDetail/repairTicketDetail.js
 var util = require('../../utils/network');
-const DatePickerUtil = require('../../utils/DatePicker.js') 
+const DatePickerUtil = require('../../utils/DatePicker.js')
 Page({
 
   /**
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
-    detailedaddress:'鑾峰彇鍦板潃',
+    deviceList:[],
+    detailedaddress: '鑾峰彇鍦板潃',
     showType: false,
-    selectType: ' 璇烽�夋嫨',
-    columns: ['璇烽�夋嫨', '婕忔按', '鍒舵按鏃堕棿杩囬暱', '鍏跺畠'],
+    deviceName: '璇烽�夋嫨',
+    deviceIndex: 0,
+    columns: [],
     showDate: false,
     selectDate: '',
-    show:'none',
-    info:'',
+    show: 'none',
+    info: '',
 
-    time:'閫夋嫨棰勭害鏃堕棿',
-    multiArray:[],//piker鐨刬tem椤�
-    multiIndex:[],//褰撳墠閫夋嫨鍒楃殑涓嬫爣
-    year:'',//閫夋嫨鐨勫勾
-    month:'',//閫夋嫨鐨勬湀
-    day:'',//閫夋嫨鐨勬棩
-    hour:'',//閫夋嫨鐨勬椂
-    minute:'',//閫夋嫨鐨勫垎
+
+    userName: '',
+    userPhone: undefined,
+    address: '',
+    description:'',
+
+    time: '閫夋嫨棰勭害鏃堕棿',
+    multiArray: [],//piker鐨刬tem椤�
+    multiIndex: [],//褰撳墠閫夋嫨鍒楃殑涓嬫爣
+    year: '',//閫夋嫨鐨勫勾
+    month: '',//閫夋嫨鐨勬湀
+    day: '',//閫夋嫨鐨勬棩
+    hour: '',//閫夋嫨鐨勬椂
+    minute: '',//閫夋嫨鐨勫垎
   },
   openShowType() {
     this.setData({
@@ -33,23 +41,45 @@
   onChangeType(event) {
     const { picker, value, index } = event.detail;
     this.setData({
-      selectType: value,
-      showType: false
+      deviceName: value,
+      showType: false,
+      deviceIndex: index
     })
   },
-  closeType(){
+  changeUserName(e) {
+    this.setData({
+      userName: e.detail.value
+    })
+
+  },
+  checkPhone(e) {
+    this.setData({
+      userPhone: e.detail.value
+    })
+  },
+  changeAdress(e) {
+    this.setData({
+      address: e.detail.value
+    })
+  },
+  changeDescription(e){
+    this.setData({
+      description: e.detail.value
+    })
+  },
+  closeType() {
     this.setData({
       showType: false
     })
   },
-  openShowDate(){
+  openShowDate() {
     this.setData({
       showDate: true
     })
   },
-  
 
-  bindMultiPickerChange: function(e) { //鏃堕棿鏃ユ湡picker閫夋嫨鏀瑰彉鍚庯紝鐐瑰嚮纭畾 
+
+  bindMultiPickerChange: function (e) { //鏃堕棿鏃ユ湡picker閫夋嫨鏀瑰彉鍚庯紝鐐瑰嚮纭畾 
     // console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
     this.setData({
       multiIndex: e.detail.value
@@ -61,56 +91,56 @@
     const hour = this.data.multiArray[3][index[3]];
     const minute = this.data.multiArray[4][index[4]];
     // console.log(`${year}-${month}-${day} ${hour}:${minute}`); 
-    
+
     this.setData({
-      time: (year+ month+ day + ' ' + hour.replace('鏃�','')+':'+minute.replace('鍒�','')).replace('骞�','-').replace('鏈�','-').replace('鏃�',''),
-      year:year, //璁板綍閫夋嫨鐨勫勾
-      month:month, //璁板綍閫夋嫨鐨勬湀
-      day:day, //璁板綍閫夋嫨鐨勬棩
-      hour:hour, //璁板綍閫夋嫨鐨勬椂
-      minute:minute, //璁板綍閫夋嫨鐨勫垎 
+      time: (year + month + day + ' ' + hour.replace('鏃�', '') + ':' + minute.replace('鍒�', '')).replace('骞�', '-').replace('鏈�', '-').replace('鏃�', ''),
+      year: year, //璁板綍閫夋嫨鐨勫勾
+      month: month, //璁板綍閫夋嫨鐨勬湀
+      day: day, //璁板綍閫夋嫨鐨勬棩
+      hour: hour, //璁板綍閫夋嫨鐨勬椂
+      minute: minute, //璁板綍閫夋嫨鐨勫垎 
     })
-    console.log(this.data.time); 
-  }, 
-  bindMultiPickerColumnChange: function(e) { //鐩戝惉picker鐨勬粴鍔ㄤ簨浠�
-  
+    console.log(this.data.time);
+  },
+  bindMultiPickerColumnChange: function (e) { //鐩戝惉picker鐨勬粴鍔ㄤ簨浠�
+
     // console.log('淇敼鐨勫垪涓�', e.detail.column, '锛屽�间负', e.detail.value);
-    
+
     let getCurrentDate = DatePickerUtil.getCurrentDate();//鑾峰彇鐜板湪鏃堕棿  
-    let currentYear = parseInt(getCurrentDate.substring(0,4)); 
-    let currentMonth = parseInt(getCurrentDate.substring(5,7)); 
-    let currentDay = parseInt(getCurrentDate.substring(8,10)); 
-    let currentHour = parseInt(getCurrentDate.substring(11,13));  
-    let currentMinute = parseInt(getCurrentDate.substring(14,16)); 
-    
+    let currentYear = parseInt(getCurrentDate.substring(0, 4));
+    let currentMonth = parseInt(getCurrentDate.substring(5, 7));
+    let currentDay = parseInt(getCurrentDate.substring(8, 10));
+    let currentHour = parseInt(getCurrentDate.substring(11, 13));
+    let currentMinute = parseInt(getCurrentDate.substring(14, 16));
+
     if (e.detail.column == 0) {//淇敼骞翠唤鍒� 
-     
+
       let yearSelected = parseInt(this.data.multiArray[e.detail.column][e.detail.value]);//褰撳墠閫夋嫨鐨勫勾浠�
- 
-      this.setData({ 
-        multiIndex:[0,0,0,0,0] ,//璁剧疆pickerIndex
-        year:yearSelected //褰撳墠閫夋嫨鐨勫勾浠�
+
+      this.setData({
+        multiIndex: [0, 0, 0, 0, 0],//璁剧疆pickerIndex
+        year: yearSelected //褰撳墠閫夋嫨鐨勫勾浠�
       });
-      
-      if(yearSelected == currentYear){//褰撳墠閫夋嫨鐨勫勾浠�==褰撳墠骞翠唤  
-        var loadPickerData=DatePickerUtil.loadPickerData();
-        
+
+      if (yearSelected == currentYear) {//褰撳墠閫夋嫨鐨勫勾浠�==褰撳墠骞翠唤  
+        var loadPickerData = DatePickerUtil.loadPickerData();
+
         this.setData({
-          multiArray:loadPickerData,//picker鏁扮粍璧嬪��
-          multiIndex:[0,0,0,0,0] //璁剧疆pickerIndex
+          multiArray: loadPickerData,//picker鏁扮粍璧嬪��
+          multiIndex: [0, 0, 0, 0, 0] //璁剧疆pickerIndex
         });
-        
-      }else{  // 閫夋嫨鐨勫勾浠斤紒=褰撳墠骞翠唤 
-      
+
+      } else {  // 閫夋嫨鐨勫勾浠斤紒=褰撳墠骞翠唤 
+
         // 澶勭悊鏈堜唤
-        let monthArr=DatePickerUtil.loadMonths(1,12)
+        let monthArr = DatePickerUtil.loadMonths(1, 12)
         // 澶勭悊鏃ユ湡
-        let dayArr=DatePickerUtil.loadDays(currentYear,currentMonth,1) 
+        let dayArr = DatePickerUtil.loadDays(currentYear, currentMonth, 1)
         // 澶勭悊hour
-        let  hourArr=DatePickerUtil.loadHours(0,24); 
+        let hourArr = DatePickerUtil.loadHours(0, 24);
         // 澶勭悊minute
-        let  minuteArr=DatePickerUtil.loadMinutes(0,60)
-         
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
         // 缁欐瘡鍒楄祴鍊煎洖鍘�
         this.setData({
           ['multiArray[1]']: monthArr,
@@ -123,119 +153,119 @@
     if (e.detail.column == 1) {//淇敼鏈堜唤鍒�
       let mon = parseInt(this.data.multiArray[e.detail.column][e.detail.value]); //褰撳墠閫夋嫨鐨勬湀浠�
       this.setData({
-        month:mon  // 璁板綍褰撳墠鍒�
+        month: mon  // 璁板綍褰撳墠鍒�
       })
-      
-      if(mon==currentMonth){//閫夋嫨鐨勬湀浠�==褰撳墠鏈堜唤 
-        if(this.data.year==currentYear){  
-        
-          // 澶勭悊鏃ユ湡
-          let dayArr=DatePickerUtil.loadDays(currentYear,mon,currentDay) 
-          // 澶勭悊hour
-          let  hourArr=DatePickerUtil.loadHours(currentHour,24); 
-          // 澶勭悊minute
-          let  minuteArr=DatePickerUtil.loadMinutes(currentMinute,60)
 
-          this.setData({ 
-            ['multiArray[2]']:dayArr,
+      if (mon == currentMonth) {//閫夋嫨鐨勬湀浠�==褰撳墠鏈堜唤 
+        if (this.data.year == currentYear) {
+
+          // 澶勭悊鏃ユ湡
+          let dayArr = DatePickerUtil.loadDays(currentYear, mon, currentDay)
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(currentHour, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+
+          this.setData({
+            ['multiArray[2]']: dayArr,
             ['multiArray[3]']: hourArr,
             ['multiArray[4]']: minuteArr
           })
-        }else{ 
+        } else {
           // 澶勭悊鏃ユ湡
-          let dayArr=DatePickerUtil.loadDays(currentYear,mon,1) 
+          let dayArr = DatePickerUtil.loadDays(currentYear, mon, 1)
           // 澶勭悊hour
-          let  hourArr=DatePickerUtil.loadHours(0,24); 
+          let hourArr = DatePickerUtil.loadHours(0, 24);
           // 澶勭悊minute
-          let  minuteArr=DatePickerUtil.loadMinutes(0,60)
-          
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
           this.setData({
-            ['multiArray[2]']:dayArr,
+            ['multiArray[2]']: dayArr,
             ['multiArray[3]']: hourArr,
             ['multiArray[4]']: minuteArr
-          });
-        } 
-      }else{  // 閫夋嫨鐨勬湀浠斤紒=褰撳墠鏈堜唤 
-         // 澶勭悊鏃ユ湡
-         let dayArr = DatePickerUtil.loadDays(currentYear,mon,1) // 浼犲叆褰撳墠骞翠唤锛屽綋鍓嶉�夋嫨鐨勬湀浠藉幓璁$畻鏃�
-         // 澶勭悊hour
-         let  hourArr = DatePickerUtil.loadHours(0,24); 
-         // 澶勭悊minute
-         let  minuteArr = DatePickerUtil.loadMinutes(0,60)
-         
-       	 this.setData({
-           ['multiArray[2]']:dayArr,
-           ['multiArray[3]']: hourArr,
-           ['multiArray[4]']: minuteArr
-         });
-      } 
-    } 
-    if(e.detail.column == 2) {//淇敼鏃�
-      let dd = parseInt(this.data.multiArray[e.detail.column][e.detail.value]);//褰撳墠閫夋嫨鐨勬棩
-      this.setData({
-        day:dd
-      })
-      if(dd==currentDay){//閫夋嫨鐨勬棩==褰撳墠鏃�
-        if(this.data.year==currentYear&&this.data.month==currentMonth){//閫夋嫨鐨勬槸浠婂ぉ 
-        
-         // 澶勭悊hour
-         let  hourArr=DatePickerUtil.loadHours(currentHour,24); 
-         // 澶勭悊minute
-         let  minuteArr=DatePickerUtil.loadMinutes(currentMinute,60)
-         
-         this.setData({
-            ['multiArray[3]']: hourArr,
-            ['multiArray[4]']: minuteArr
-         });
-         
-        }else{ //閫夋嫨鐨勪笉鏄粖澶� 
-          // 澶勭悊hour
-          let  hourArr=DatePickerUtil.loadHours(0,24); 
-          // 澶勭悊minute
-          let  minuteArr=DatePickerUtil.loadMinutes(0,60)
-          
-          this.setData({
-             ['multiArray[3]']: hourArr,
-             ['multiArray[4]']: minuteArr
           });
         }
-      }else{  // 閫夋嫨鐨勬棩锛�=褰撳墠鏃� 
-       // 澶勭悊hour
-       let  hourArr=DatePickerUtil.loadHours(0,24); 
-       // 澶勭悊minute
-       let  minuteArr=DatePickerUtil.loadMinutes(0,60)
-       
-       this.setData({
-         ['multiArray[3]']: hourArr,
-         ['multiArray[4]']: minuteArr
-       });
+      } else {  // 閫夋嫨鐨勬湀浠斤紒=褰撳墠鏈堜唤 
+        // 澶勭悊鏃ユ湡
+        let dayArr = DatePickerUtil.loadDays(currentYear, mon, 1) // 浼犲叆褰撳墠骞翠唤锛屽綋鍓嶉�夋嫨鐨勬湀浠藉幓璁$畻鏃�
+        // 澶勭悊hour
+        let hourArr = DatePickerUtil.loadHours(0, 24);
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+        this.setData({
+          ['multiArray[2]']: dayArr,
+          ['multiArray[3]']: hourArr,
+          ['multiArray[4]']: minuteArr
+        });
       }
-    } 
-    if(e.detail.column == 3) {//淇敼鏃�
-      let hh = parseInt(this.data.multiArray[e.detail.column][e.detail.value]); //褰撳墠閫夋嫨鐨勬椂
+    }
+    if (e.detail.column == 2) {//淇敼鏃�
+      let dd = parseInt(this.data.multiArray[e.detail.column][e.detail.value]);//褰撳墠閫夋嫨鐨勬棩
       this.setData({
-        hour:hh
+        day: dd
       })
-      if(hh==currentHour){//閫夋嫨鐨勬椂==褰撳墠鏃� 
-        if(this.data.year==currentYear&&this.data.month==currentMonth&&this.data.month==currentMonth){   // 閫夋嫨鐨勬槸浠婂ぉ
-          
+      if (dd == currentDay) {//閫夋嫨鐨勬棩==褰撳墠鏃�
+        if (this.data.year == currentYear && this.data.month == currentMonth) {//閫夋嫨鐨勬槸浠婂ぉ 
+
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(currentHour, 24);
           // 澶勭悊minute
-            let  minuteArr=DatePickerUtil.loadMinutes(currentMinute,60)
-            this.setData({ 
-              ['multiArray[4]']: minuteArr
-            });
-        }else{ // 閫夋嫨鐨勪笉鏄粖澶�
-        
-          // 澶勭悊minute
-          let  minuteArr=DatePickerUtil.loadMinutes(0,60)
-          this.setData({ 
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+
+          this.setData({
+            ['multiArray[3]']: hourArr,
             ['multiArray[4]']: minuteArr
           });
-        } 
-      }else{//閫夋嫨鐨勬椂锛�=褰撳墠鏃� 
+
+        } else { //閫夋嫨鐨勪笉鏄粖澶� 
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(0, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+          this.setData({
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          });
+        }
+      } else {  // 閫夋嫨鐨勬棩锛�=褰撳墠鏃� 
+        // 澶勭悊hour
+        let hourArr = DatePickerUtil.loadHours(0, 24);
         // 澶勭悊minute
-        let  minuteArr=DatePickerUtil.loadMinutes(0,60)
-        this.setData({ 
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+        this.setData({
+          ['multiArray[3]']: hourArr,
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    if (e.detail.column == 3) {//淇敼鏃�
+      let hh = parseInt(this.data.multiArray[e.detail.column][e.detail.value]); //褰撳墠閫夋嫨鐨勬椂
+      this.setData({
+        hour: hh
+      })
+      if (hh == currentHour) {//閫夋嫨鐨勬椂==褰撳墠鏃� 
+        if (this.data.year == currentYear && this.data.month == currentMonth && this.data.month == currentMonth) {   // 閫夋嫨鐨勬槸浠婂ぉ
+
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+          this.setData({
+            ['multiArray[4]']: minuteArr
+          });
+        } else { // 閫夋嫨鐨勪笉鏄粖澶�
+
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+          this.setData({
+            ['multiArray[4]']: minuteArr
+          });
+        }
+      } else {//閫夋嫨鐨勬椂锛�=褰撳墠鏃� 
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+        this.setData({
           ['multiArray[4]']: minuteArr
         });
       }
@@ -247,61 +277,137 @@
 
     // console.log('淇敼鐨勫垪涓�', e.detail.column, '锛屽�间负', e.detail.value);
     data.multiIndex[e.detail.column] = e.detail.value; //灏嗗�艰祴鍥炲幓
-    
+
     this.setData(data);  //灏嗗�艰祴鍥炲幓
   },
   choseLocation() {
-    wx.chooseLocation({
-      success: (res) => {
-        console.log(res)
-        this.setData({
-          // address: res.name,
-          detailedaddress: res.address,
-          locmap: {
-            latitude: res.latitude,
-            longitude: res.longitude
-          },
-          markers: [{
-            id: 0,
-            latitude: res.latitude,
-            longitude: res.longitude,
-            iconPath: '/images/ProRep/weizhi.png',
-            width: '50rpx',
-            height: '50rpx'
-          }]
-        })
+    // wx.chooseLocation({
+    //   success: (res) => {
+    //     console.log(res)
+    //     this.setData({
+    //       // address: res.name,
+    //       detailedaddress: res.address,
+    //       locmap: {
+    //         latitude: res.latitude,
+    //         longitude: res.longitude
+    //       },
+    //       markers: [{
+    //         id: 0,
+    //         latitude: res.latitude,
+    //         longitude: res.longitude,
+    //         iconPath: '/images/ProRep/weizhi.png',
+    //         width: '50rpx',
+    //         height: '50rpx'
+    //       }]
+    //     })
+    //   },
+    //   fail: () => {
+    //     wx.getSetting({
+    //       success: (res) => {
+    //         var statu = res.authSetting;
+    //         if (!statu['scope.userLocation']) { //鏈巿鏉�
+    //           wx.showModal({
+    //             title: '鎺堟潈瀹氫綅',
+    //             content: '闇�瑕佽幏鍙栨偍鐨勫湴鐞嗕綅缃紝璇峰厛璁剧疆鎺堟潈',
+    //             // cancelColor: 'skyblue',
+    //             confirmText: "鍘昏缃�",
+    //             success: (res) => {
+    //               console.log(res);
+    //               if (res.cancel) {
+    //                 //鐐瑰嚮鍙栨秷,榛樿闅愯棌寮规
+    //               } else {
+    //                 //鐐瑰嚮纭畾
+    //                 wx.openSetting({
+    //                   withSubscriptions: true,
+    //                   success: (res) => {
+    //                     console.log(res);
+    //                     this.onLoad()
+    //                   }
+    //                 })
+    //               }
+    //             }
+    //           })
+    //         }
+    //       }
+    //     })
+    //   }
+    // })
+  },
+
+  submit() {
+    let reg = /^1[3-9]\d{9}$/;
+    if (!this.data.deviceName) {
+      wx.showToast({
+        title: '璇烽�夋嫨璁惧',
+        icon: 'none'
+      });
+      return false
+    }else if(!this.data.userName) {
+      wx.showToast({
+        title: '璇疯緭鍏ョ敤鎴峰悕',
+        icon: 'none'
+      });
+      return false
+    }else if(!reg.test(this.data.userPhone)) {
+      wx.showToast({
+        title: '鎵嬫満鍙锋牸寮忎笉姝g‘',
+        icon: 'none'
+      });
+      return false
+    }else if(!this.data.address) {
+      wx.showToast({
+        title: '璇疯緭鍏ュ湴鍧�',
+        icon: 'none'
+      });
+      return false
+    }
+    let data = {
+      deviceId: this.data.deviceList[this.data.deviceIndex].deviceId,
+      erectoId: 0,
+      erectoName: '鏈寚娲�',
+      userName: this.data.userName,
+      userPhone: this.data.userPhone,
+      address: this.data.address,
+      // appointmentTime:this.formatDate(this.data.time+':'+'00') ,
+      appointmentTime:this.data.time+':'+'00',
+      state: -1,
+      orderType:'2'
+    }
+    console.log(data);
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/iot/deviceOrder',
+      method: "POST",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
       },
-      fail: () => {
-        wx.getSetting({
-          success: (res) => {
-            var statu = res.authSetting;
-            if (!statu['scope.userLocation']) { //鏈巿鏉�
-              wx.showModal({
-                title: '鎺堟潈瀹氫綅',
-                content: '闇�瑕佽幏鍙栨偍鐨勫湴鐞嗕綅缃紝璇峰厛璁剧疆鎺堟潈',
-                // cancelColor: 'skyblue',
-                confirmText: "鍘昏缃�",
-                success: (res) => {
-                  console.log(res);
-                  if (res.cancel) {
-                    //鐐瑰嚮鍙栨秷,榛樿闅愯棌寮规
-                  } else {
-                    //鐐瑰嚮纭畾
-                    wx.openSetting({
-                      withSubscriptions: true,
-                      success: (res) => {
-                        console.log(res);
-                        this.onLoad()
-                      }
-                    })
-                  }
-                }
-              })
-            }
-          }
-        })
+      data: data,
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          wx.navigateTo({
+            url: '/pages/workOrder/workOrder',
+          })
+        }
       }
     })
+  },
+  formatDate(dateStr) {
+    let date = new Date(dateStr);
+  
+    let year = date.getFullYear();
+    let month = (date.getMonth() + 1).toString().padStart(2, '0');  // 娉ㄦ剰锛氭湀浠芥槸浠� 0 寮�濮嬬殑锛屾墍浠ラ渶瑕� +1
+    let day = date.getDate().toString().padStart(2, '0');
+    let hour = date.getHours().toString().padStart(2, '0');
+    let minute = date.getMinutes().toString().padStart(2, '0');
+    let second = date.getSeconds().toString().padStart(2, '0');
+    let millisecond = date.getMilliseconds().toString().padStart(3, '0');
+  
+    return `${year}-${month}-${day}T${hour}:${minute}:${second}.${millisecond}Z`;
   },
 
 
@@ -309,7 +415,17 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
-    
+    this.setData({
+      deviceList:wx.getStorageSync('deviceList')
+    })
+    let dataDevice = []
+    for (let i = 0; i < this.data.deviceList.length; i++) {
+      dataDevice.push(this.data.deviceList[i].productName)
+    }
+    this.setData({
+      columns: dataDevice
+    })
+
   },
 
   /**
@@ -323,26 +439,26 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow() {
-    var  loadPickerData=DatePickerUtil.loadPickerData()
-    var  getCurrentDate=DatePickerUtil.getCurrentDate()
-    var  GetMultiIndex=DatePickerUtil.GetMultiIndex() 
-    
+    var loadPickerData = DatePickerUtil.loadPickerData()
+    var getCurrentDate = DatePickerUtil.getCurrentDate()
+    var GetMultiIndex = DatePickerUtil.GetMultiIndex()
+
     //杩欓噷鍐欑殑鏄负浜嗚褰曞綋鍓嶆椂闂�
-    let year=parseInt(getCurrentDate.substring(0,4)); 
-    let month=parseInt(getCurrentDate.substring(5,7)); 
-    let day=parseInt(getCurrentDate.substring(8,10)); 
-    let hour=parseInt(getCurrentDate.substring(11,13));   
-    let minute=parseInt(getCurrentDate.substring(14,16)); 
-    this.setData({  
-      multiArray:loadPickerData,//picker鏁扮粍璧嬪�硷紝鏍煎紡 [years, months, days, hours, minutes]
-      multiIndex:GetMultiIndex,//璁剧疆pickerIndex锛孾0,0,0,0,0]
-      time:getCurrentDate.replace('骞�','-').replace('鏈�','-').replace('鏃�',' '), //璁剧疆褰撳墠鏃堕棿 锛宑urrentYears+'-'+mm+'-'+dd+' '+hh+':'+min
-      year:year,//璁板綍閫夋嫨鐨勫勾
-      month:month,//璁板綍閫夋嫨鐨勬湀
-      day:day,//璁板綍閫夋嫨鐨勬棩
-      hour:hour,//璁板綍閫夋嫨鐨勬椂
-      minute:minute,//璁板綍閫夋嫨鐨勫垎 
-    });   
+    let year = parseInt(getCurrentDate.substring(0, 4));
+    let month = parseInt(getCurrentDate.substring(5, 7));
+    let day = parseInt(getCurrentDate.substring(8, 10));
+    let hour = parseInt(getCurrentDate.substring(11, 13));
+    let minute = parseInt(getCurrentDate.substring(14, 16));
+    this.setData({
+      multiArray: loadPickerData,//picker鏁扮粍璧嬪�硷紝鏍煎紡 [years, months, days, hours, minutes]
+      multiIndex: GetMultiIndex,//璁剧疆pickerIndex锛孾0,0,0,0,0]
+      time: getCurrentDate.replace('骞�', '-').replace('鏈�', '-').replace('鏃�', ' '), //璁剧疆褰撳墠鏃堕棿 锛宑urrentYears+'-'+mm+'-'+dd+' '+hh+':'+min
+      year: year,//璁板綍閫夋嫨鐨勫勾
+      month: month,//璁板綍閫夋嫨鐨勬湀
+      day: day,//璁板綍閫夋嫨鐨勬棩
+      hour: hour,//璁板綍閫夋嫨鐨勬椂
+      minute: minute,//璁板綍閫夋嫨鐨勫垎 
+    });
   },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
diff --git a/GoldC/pages/repairTicketDetail/repairTicketDetail.wxml b/GoldC/pages/repairTicketDetail/repairTicketDetail.wxml
index a1062c1..2f563aa 100644
--- a/GoldC/pages/repairTicketDetail/repairTicketDetail.wxml
+++ b/GoldC/pages/repairTicketDetail/repairTicketDetail.wxml
@@ -24,16 +24,32 @@
     <view class="left">
       璁惧鍚嶇О
     </view>
-    <view class="right">
-      璁惧1鍙�
+    <view class="right" bind:tap="openShowType">
+      {{deviceName}} >
     </view>
   </view>
-  <view class="item">
+  <!-- <view class="item">
     <view class="left">
       鏁呴殰绫诲瀷
     </view>
     <view class="right" bind:tap="openShowType">
-      {{selectType}} >
+      {{deviceName}} >
+    </view>
+  </view> -->
+  <view class="item">
+    <view class="left">
+      鐢ㄦ埛濮撳悕
+    </view>
+    <view class="right" bind:tap="choseLocation">
+      <input class="input" placeholder="璇疯緭鍏ョ敤鎴峰鍚�" type="phone" bindinput="changeUserName"></input>
+    </view>
+  </view>
+  <view class="item">
+    <view class="left">
+      鐢佃瘽
+    </view>
+    <view class="right">
+      <input class="input" placeholder="璇疯緭鍏ユ墜鏈哄彿"  type="number" pattern="^1[3-9]\d{9}$" bindinput="checkPhone"></input>
     </view>
   </view>
   <view class="item">
@@ -41,7 +57,8 @@
       鍦板潃
     </view>
     <view class="right" bind:tap="choseLocation">
-      {{detailedaddress}}  >
+    
+      <input class="input" placeholder="璇疯緭鍏ュ湴鍧�"  bindinput="changeAdress"></input>
     </view>
   </view>
   <view class="item">
@@ -59,11 +76,15 @@
   <view style="display: flex;justify-content: space-between;">
     <view style="margin-left: 5px;">鏁呴殰鎻忚堪</view>
     <view style="width: calc(100% - 80px);">
-      <van-field class="info" style="min-height: 200px;" value="{{ message }}" label="" type="textarea" placeholder="璇疯緭鍏ヨ澶囨晠闅滅殑鍩烘湰鎻忚堪" autosize />
+      <van-field class="info" style="min-height: 200px;" value="{{ description }}" label="" bindinput="changeDescription" type="textarea" placeholder="璇疯緭鍏ヨ澶囨晠闅滅殑鍩烘湰鎻忚堪" autosize />
     </view>
   </view>
-  <view style="width: 90%;margin-left: 5%;height: 40px;line-height: 40px;background-color: #007CFE;text-align: center;color: #fff;margin-top: 10px;">鎻愪氦鎶ヤ慨鍗�</view>
+  <view bind:tap="submit" style="width: 90%;margin-left: 5%;height: 40px;line-height: 40px;background-color: #007CFE;text-align: center;color: #fff;margin-top: 10px;">鎻愪氦鎶ヤ慨鍗�</view>
 </view>
+<!-- <van-popup show="{{ showType }}" position="bottom" custom-style="height: 40%;" bind:close="onClose">
+  <van-picker columns="{{ columns }}" show-toolbar bind:cancel="closeType" bind:confirm="onChangeType" />
+</van-popup> -->
+
 <van-popup show="{{ showType }}" position="bottom" custom-style="height: 40%;" bind:close="onClose">
   <van-picker columns="{{ columns }}" show-toolbar bind:cancel="closeType" bind:confirm="onChangeType" />
 </van-popup>
diff --git a/GoldC/pages/repairTicketDetail/repairTicketDetail.wxss b/GoldC/pages/repairTicketDetail/repairTicketDetail.wxss
index f35855f..9a28d4d 100644
--- a/GoldC/pages/repairTicketDetail/repairTicketDetail.wxss
+++ b/GoldC/pages/repairTicketDetail/repairTicketDetail.wxss
@@ -20,6 +20,14 @@
 .main .item .right {
   margin-right: 5px;
   color: #778CBD;
+  line-height: 40px;
+  height: 40px;
+
+}
+
+.main .item .right input {
+  height: 40px;
+  text-align: right;
 }
 
 .info .van-cell {
@@ -28,9 +36,10 @@
   border: 1px solid #778CBD;
   border-radius: 5px;
   margin-top: 10px;
-  
+
 }
-.van-field__input--textarea{
+
+.van-field__input--textarea {
   height: 200px !important;
   padding-top: 5px !important;
-}
+}
\ No newline at end of file
diff --git a/GoldC/pages/scanCode/scanCode.js b/GoldC/pages/scanCode/scanCode.js
index a55af0e..625dea7 100644
--- a/GoldC/pages/scanCode/scanCode.js
+++ b/GoldC/pages/scanCode/scanCode.js
@@ -1,4 +1,5 @@
 // pages/scanCode/scanCode.js
+const app = getApp()
 Page({
 
   /**
@@ -34,6 +35,50 @@
 
 
   },
+  bindcode(e){
+    console.log(e);
+    this.setData({
+      code :e.detail
+    })
+  },
+
+  add() {
+    console.log(app);
+    let data = {
+      serialNumber: this.data.code,
+      userId: wx.getStorageSync('userInfo').userId
+    }
+    wx.request({
+      url: `https://puyue.yhupai.com/prod-api/iot/operator/device/bindUser?serialNumber=${this.data.code}&userId=${wx.getStorageSync('userInfo').userId}`,
+      method: "POST",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      // data: data,
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+          wx.switchTab({
+            url: '/pages/home/home',
+          })
+          // this.setData({
+          //   code:''
+          // })
+         
+        }
+      }
+    })
+
+  },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
diff --git a/GoldC/pages/scanCode/scanCode.wxml b/GoldC/pages/scanCode/scanCode.wxml
index bce88b5..a7f31c4 100644
--- a/GoldC/pages/scanCode/scanCode.wxml
+++ b/GoldC/pages/scanCode/scanCode.wxml
@@ -3,9 +3,9 @@
   杈撳叆鎴栨壂鎻忚澶囦簩缁寸爜
 </view>
 <view class="main">
-  <van-field value="{{ code }}" placeholder="璇疯緭鍏ヨ澶噄d"  style="width: 75%;" />
+  <van-field value="{{ code }}" placeholder="璇疯緭鍏ヨ澶囧簭鍒楀彿"  bindinput="bindcode"  style="width: 75%;" />
   <view class="scan" bind:tap="scanCode">鎵爜</view>
 </view>
 <!-- <view > -->
-  <view class="add">娣诲姞璁惧</view>
+  <view class="add" bind:tap="add">娣诲姞璁惧</view>
 <!-- </view> -->
diff --git a/GoldC/pages/waterUses/waterUses.wxss b/GoldC/pages/waterUses/waterUses.wxss
index aa22fee..ca9ba07 100644
--- a/GoldC/pages/waterUses/waterUses.wxss
+++ b/GoldC/pages/waterUses/waterUses.wxss
@@ -1 +1,4 @@
-/* pages/waterUses/waterUses.wxss */
\ No newline at end of file
+/* pages/waterUses/waterUses.wxss */
+.van-tabs__line {
+  background-color: #1E90FF !important;
+}
\ No newline at end of file
diff --git a/GoldC/pages/workOrder/workOrder.js b/GoldC/pages/workOrder/workOrder.js
index 5162522..9b4bbb3 100644
--- a/GoldC/pages/workOrder/workOrder.js
+++ b/GoldC/pages/workOrder/workOrder.js
@@ -1,94 +1,273 @@
-// pages/workOrder/workOrder.js
-// import Dialog from "/miniprogram_npm/vant-weapp/dialog/index"
-import Dialog from "../../miniprogram_npm/vant-weapp/dialog/index"
+
 Page({
 
   /**
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
+    tabs: [0, 2, 3] ,
+    showPage: false,
+    showNull: false,
+    roleKey: wx.getStorageSync('roleKey'),
+    nextlevel: 0,
+    showTabs: false,
+    erectoListLevel: [],
+    state: 0,
+    listdata: [],
     active: 0,
+
+    isadmin: true,
+    bohui: true,
     show: false,
-    WXinfo: {
-      phone: '',
-      question:'',
-      img:'',
+    text: '',
+    itemId: '',
+
+    // currentIndex:1,
+    // totalPage:0,
+    index: 1,
+    total: 10,
+
+    pageMask: false,
+    prevBtnDis: true,
+    nextBtnDis: false,
+    properties: {
+      currentIndex: { //褰撳墠椤电爜
+        type: Number,
+        value: 1
+      },
+      totalPage: {
+        type: Number
+      }
+    },
+  },
+  lifetimes: {
+    // 鍦ㄧ粍浠跺疄渚嬭繘鍏ラ〉闈㈣妭鐐规爲鏃舵墽琛�
+    attached: function () {
+      this.setData({
+        index: this.properties.currentIndex,
+        total: this.properties.totalPage
+      })
     }
   },
-  onChange(event) {
-    // wx.showToast({
-    //   title: `鍒囨崲鍒版爣绛� ${event.detail.name}`,
-    //   icon: 'none',
-    // });
-  },
-  openAddModal(){
-    this.setData({
-      show:true
+
+  // 璇︽儏灞曠ず
+  toxiangqin(e) {
+    console.log(e.target.dataset.id)
+    var id = e.target.dataset.id
+    wx.navigateTo({
+      url: '/pages/xiangqing/xiangqing?id=' + id,
     })
-
   },
-  getUserInfo(event) {
-    console.log(event.detail);
-  },
-
-  onClose() {
-    this.setData({ show: false });
-  },
-
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
-  onLoad(options) {
-
-
+  onLoad: function (options) {
+  },
+  // 璁剧疆寮傛璇锋眰涔嬪悗鐨勯〉闈€�佹�昏褰曟暟
+  setPage(index, total) {
+    this.setData({
+      index,
+      total
+    })
   },
 
+  //姣忔鏀瑰彉椤电爜灏辫皟鐢ㄨ鍑芥暟
+  triggerParent: function () {
+
+    // 閫氱煡鐖剁粍浠跺綋鍓嶅姞杞界殑椤垫暟
+
+    // 鑷畾涔夌粍浠跺悜鐖剁粍浠朵紶鍊� 
+    const option = {
+      currentIndex: this.data.index
+    };
+
+    // pagingChange 鑷畾涔夊悕绉颁簨浠讹紝鐖剁粍浠朵腑浣跨敤
+    this.triggerEvent('pagingChange', option)
+
+  },
+  //寮�鍚〉鐮佸脊绐�
+  showPagePopUp: function () {
+    this.setData({
+      pageMask: true
+    })
+  },
+  //鍏抽棴椤电爜寮圭獥
+  hidePagePopUp: function () {
+    this.setData({
+      pageMask: false
+    })
+  },
+  //鏇存敼椤电爜鐐瑰嚮浜嬩欢
+  onChangePage: function (e) {
+    //console.log("鏇存敼椤电爜浜嬩欢锛�",e);
+    this.setData({
+      pageMask: false,
+      index: e.currentTarget.dataset.index //鐐瑰嚮鐨勯〉鏁�
+    })
+    this.getList()
+    // 鍏堝垽鏂綋鍓嶉〉鏁帮紝鏄惁闇�瑕佹洿鏂癲isabled鐨勭姸鎬�
+    this.updateBtnDis();
+    this.triggerParent();
+  },
+  //涓婁竴椤电偣鍑讳簨浠�
+  prevPage: function () {
+    if (this.data.index <= 1) return;
+    let num = this.data.index - 1;
+    this.setData({
+      index: num
+    })
+    this.getList()
+    this.triggerParent();
+    鏇存柊鎸夐挳鐘舵��
+    this.updateBtnDis();
+  },
+  //涓嬩竴椤电偣鍑讳簨浠�
+  nextPage: function () {
+    if (this.data.index >= this.data.total) return;
+    let num = this.data.index + 1;
+    this.setData({
+      index: num
+    })
+    this.getList()
+    this.triggerParent();
+
+    // 鏇存柊鎸夐挳鐘舵��
+    this.updateBtnDis();
+  },
+  onChange(event) {
+    // this.setData({
+    //   state:this.data.tabs[event.detail.index]
+    // })
+    this.data.state=this.data.tabs[event.detail.index]
+    this.getList()
+  },
+  getList() {
+    wx.showLoading({
+      title: '鍔犺浇涓�',
+    })
+    this.setData({
+      tableData: []
+    })
+    var erectoId = wx.getStorageSync("erectoId")
+    var roleKey = wx.getStorageSync('roleKey')
+    let data = {
+      pageNum: this.data.index,
+      pageSize: 10,
+      state: this.data.state,
+      orderType: 2,
+    }
+    if (roleKey == 'tenantservice') {
+      data.createUserId = 0
+      data.erectoId = erectoId
+    }
+    if (roleKey == 'admin') {
+      data.createUserId = 0;
+      data.erectoId = 0;
+    }
+    if (roleKey == 'tenant' || roleKey == 'tenanthelper') {
+      data.createUserId = erectoId;
+      data.erectoId = 0;
+    }
+    if (this.data.active2 == 1) { //褰撻�夋嫨涓嬬骇鏃禱
+      data.createUserId = this.data.nextlevel
+    }
+    console.log(data);
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/iot/deviceOrder/list',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      data: data,
+      success: (res, header) => {
+        if (res.data.code == 200 && res.data.rows.length > 0) {
+
+          let data = res.data
+          let total = Math.ceil(res.data.total / 10)
+          this.setData({
+            listdata: data.rows,
+            total: total,
+            showPage:true,
+            showNull:false
+          })
+          console.log(this.data.listdata)
+          wx.hideLoading()
+
+        } else {
+          this.setData({
+            listdata: [],
+            total: 0,
+            showPage:false,
+            showNull:true
+          })
+          wx.hideLoading()
+        }
+      }
+    })
+  },
+  openAddModal(){
+    let deviceList=wx.getStorageSync('deviceList')
+    if(deviceList.length>0){
+      wx.navigateTo({
+        url: '/pages/repairTicketDetail/repairTicketDetail',
+      })
+    }else{
+      wx.showToast({
+        title: '璇峰厛娣诲姞璁惧',
+      })
+    }
+
+  },
+  
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
    */
-  onReady() {
-
+  onReady: function () {
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
-  onShow() {
-
+  onShow: function () {
+    this.getList()
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
    */
-  onHide() {
+  onHide: function () {
 
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
    */
-  onUnload() {
-
+  onUnload: function () {
+    // console.log(111111111)
+    wx.switchTab({
+      url: '/pages/home/home',
+    })
   },
 
   /**
    * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
    */
-  onPullDownRefresh() {
+  onPullDownRefresh: function () {
 
   },
 
   /**
    * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
    */
-  onReachBottom() {
+  onReachBottom: function () {
 
   },
 
   /**
    * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
    */
-  onShareAppMessage() {
+  onShareAppMessage: function () {
 
   }
 })
\ No newline at end of file
diff --git a/GoldC/pages/workOrder/workOrder.wxml b/GoldC/pages/workOrder/workOrder.wxml
index 86ba2e2..07c4d04 100644
--- a/GoldC/pages/workOrder/workOrder.wxml
+++ b/GoldC/pages/workOrder/workOrder.wxml
@@ -2,18 +2,85 @@
 <!-- <text>pages/workOrder/workOrder.wxml</text> -->
 <view style="width: 100%;display: flex;">
   <van-tabs active="{{ active }}" bind:change="onChange" style="width:90%">
-    <van-tab title="寰呮淳鍗�">寰呮淳鍗�</van-tab>
-    <van-tab title="宸插畬鎴�">宸插畬鎴�</van-tab>
-    <van-tab title="缁翠慨涓�">缁翠慨涓�</van-tab>
+    <van-tab title="寰呮淳鍗�" ></van-tab>
+    <van-tab title="缁翠慨涓�" ></van-tab>
+    <van-tab title="宸插畬鎴�" ></van-tab>
   </van-tabs>
   <view class="add" bind:tap="openAddModal">
     +
   </view>
 </view>
-<van-dialog use-slot title="缁翠慨淇℃伅" show="{{ show }}" show-cancel-button confirm-button-open-type="getUserInfo" bind:close="onClose" bind:getuserinfo="getUserInfo">
-  <van-cell-group>
-    <van-field value="{{ WXinfo.phone }}" required clearable label="棰勭暀鐢佃瘽"  placeholder=""  />
-    <van-field value="{{ WXinfo.question }}" clearable label="闂璇存槑" placeholder="" required  />
-    <van-field value="{{ WXinfo.img }}" clearable label="鍥剧墖涓婁紶" placeholder="" required  />
-  </van-cell-group>
-</van-dialog>
\ No newline at end of file
+
+<view class="listBox">
+  <view class="list" wx:for="{{listdata}}">
+    <view class="heard">
+      <view class="htext">{{item.device.deviceName}}</view>
+    </view>
+    <view class="body">
+      <view class="h2txt">
+        <image class="primg" src="/images/ProRep/pingding.png"></image>
+        鐢ㄦ埛淇℃伅锛�
+      </view>
+      <view class="text">鐢ㄦ埛濮撳悕锛歿{item.userName}}</view>
+      <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}}</view>
+      <view class="h2txt">
+        <image class="primg" src="/images/ProRep/uptext.png"></image>
+        鏁呴殰鎻忚堪锛�
+      </view>
+      <view class="text">{{item.remark?item.remark:'--'}}</view>
+      <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view> -->
+      <!-- <view class="h2txt">闂鍥剧墖锛�</view> -->
+      <!-- <view style="padding-left: 30rpx;">
+            <image wx:for="{{item.Reported_ImgArray}}" wx:for-item="imgitem" class="quImg" style="{{item.loading?'display:block':'display:none'}}" bindload="imgOnLoad" data-index="{{index}}" data-imgindex="{{imgitem}}" mode="aspectFill" src="{{'http://47.92.31.84:8088'+ imgitem}}" bindtap="imgYu" data-img="{{'http://47.92.31.84:8088'+ imgitem}}"></image>
+          </view> -->
+      <!--  -->
+
+      <!--  -->
+      <view class="address">
+        <image class="timeicon" src="/images/address.png"></image>
+        <text>{{item.address}}</text>
+      </view>
+      <view class="time">
+        <image class="timeicon" src="/images/time.png"></image>
+        <text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
+      </view>
+    </view>
+    <view class="footer">
+      <view class="libtn">
+        <!-- 淇敼 -->
+        <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}">
+          <van-icon name="edit" class="icon" />
+          <text>淇敼</text>
+        </view>
+      </view>
+      <view class="libtn">
+        <!-- 鍒犻櫎 -->
+        <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
+          <van-icon name="delete" class="icon" /><text>鍒犻櫎</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+
+
+<view class="noData" wx:if="{{showNull}}">
+  <image class="nodataicon" src="/images/nodataimg.png"></image>
+  <view>鏆傛棤鐩稿叧鏁版嵁</view>
+</view>
+
+<view class="page-control" wx:if="{{showPage}}">
+  <view class="page-control-btns">
+    <view class="page-btn {{prevBtnDis?'btn-disabled':''}}" bindtap="prevPage">涓婁竴椤�</view>
+    <view class="page-number" bindtap="shopPagePopup"><text>{{index}}</text>/<text>{{total}}</text></view>
+    <view class="page-btn {{nextBtnDis?'btn-disabled':''}}" bindtap="nextPage">涓嬩竴椤�</view>
+  </view>
+  <view class="page-container" hidden="{{!pageMask}}">
+    <view class="page-mask" bindtap="hidePagePopup"></view>
+    <view class="page-popup">
+      <view class="page-popup-box">
+        <view class="page-line" wx:for="{{total}}" wx:for-index="idx" data-index="{{idx+1}}" bindtap="changePage">绗瑊{item+1}}椤�</view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/GoldC/pages/workOrder/workOrder.wxss b/GoldC/pages/workOrder/workOrder.wxss
index e5ccc49..29325a4 100644
--- a/GoldC/pages/workOrder/workOrder.wxss
+++ b/GoldC/pages/workOrder/workOrder.wxss
@@ -1,5 +1,5 @@
 /* pages/workOrder/workOrder.wxss */
-.add{
+.add {
   width: 10%;
   height: 44px;
   line-height: 44px;
@@ -7,17 +7,333 @@
   font-size: 30px;
   background-color: #fff;
 }
-.info{
+
+.info {
   margin: 5px 0;
 }
-.van-dialog__cancel,  .van-dialog__confirm {
-  border: 0!important;
+
+.van-dialog__cancel,
+.van-dialog__confirm {
+  border: 0 !important;
   width: 100%;
   padding: 0;
 }
+
 .van-dialog__button {
- 
+
   flex: 1;
   width: 50%;
   margin: 0 auto;
-}
\ No newline at end of file
+}
+
+.chooseImg {
+  background-color: #007CFE;
+  text-align: center;
+  color: #fff;
+  padding: 5px 10px;
+}
+
+.van-tabs__line {
+  background-color: #1E90FF !important;
+}
+
+
+.listBox {
+  width: 100%;
+}
+.primg{
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
+}
+.xiangqingtxt{
+  color: #1E90FF;
+  margin-bottom: 10rpx;
+  padding-left: 30rpx;
+}
+.list {
+  width: 95vw;
+  /* height: 420rpx; */
+  border-radius: 10rpx;
+  background-color: white;
+  margin: 20rpx auto;
+}
+
+.heard {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 70rpx;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+}
+
+.htext {
+  font-size: 34rpx;
+  font-weight: 600;
+}
+.h2txt{
+  font-size: 30rpx;
+  font-weight: 600;
+  color: black;
+  display: flex;
+  align-items: center;
+}
+.state {
+  font-size: 25rpx;
+}
+
+.body {
+  /* height: 280rpx; */
+  padding: 0 20rpx;
+  color: #777;
+  box-sizing: border-box;
+}
+
+/* 鏂囧瓧璇存槑鏄剧ず涓よ  婧㈠嚭鐪佺暐澶勭悊 */
+.text {
+  /* height: 80rpx; */
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  text-overflow: ellipsis;
+  padding-left: 30rpx;
+  box-sizing: border-box;
+}
+
+.quImg {
+  height: 200rpx;
+  width: 250rpx;
+  border-radius: 10rpx;
+  display: inline-block!important;
+  margin-right: 15rpx;
+}
+.imgloading{
+  height: 200rpx;
+  width: 250rpx;
+  line-height: 200rpx;
+  text-align: center;
+}
+.time{
+  display: flex;
+  align-items: center;
+  padding-bottom: 10rpx;
+  border-bottom: 1px solid gainsboro;
+}
+.address{
+  display: flex;
+  align-items: center;
+  margin-bottom: 10rpx;
+  margin-top: 10rpx;
+}
+.timeicon{
+  width: 33rpx;
+  height: 33rpx;
+  margin-right: 10rpx;
+}
+.footer {
+  height: 70rpx;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+
+.libtn {
+  width: 25%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.btn {
+  width: 75%;
+  margin: 0 auto;
+  padding: 6rpx 0;
+  /* background-color: red; */
+  color: white;
+  border-radius: 5rpx;
+  text-align: center;
+  font-size: 25rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.icon {
+  position: relative;
+  top: 4rpx;
+}
+
+.btn-adit{
+  background-color: #1E90FF;
+}
+.btn-del{
+  background-color: rgb(255, 94, 0);
+}
+.btn-back{
+  background-color: rgb(252, 215, 4);
+}
+.btn-pass{
+  background-color: rgb(34, 214, 34);
+}
+.btn-chehui{
+  background-color: rgb(153, 78, 207);
+}
+.btn-lishi{
+  background-color: orange;
+}
+.noData{
+  width: 100%;
+  text-align: center;
+  margin-top: 30rpx;
+  color: #999;
+  margin-top: 50%;
+}
+.nodataicon{
+  width: 400rpx;
+  height: 234rpx;
+}
+
+
+.overlay{
+  width: 100vw;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.42);
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 120;
+}
+.reply{
+  width: 85%;
+  /* height: 60%; */
+  background-color: white;
+  border-radius: 15rpx;
+  z-index: 1111;
+}
+.replybody{
+  width: 100%;
+  height: calc(100% - 100rpx);
+}
+.reptitle{
+  width: 100%;
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  font-size: 35rpx;
+  font-weight: 600;
+  border-bottom: 1rpx solid #999;
+}
+.replyfooter{
+  width: 100%;
+  height: 100rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  /* background-color: gold; */
+}
+.replybtn{
+  width: 150rpx;
+  height: 60rpx;
+  border: 1rpx solid #ddd;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 60rpx;
+}
+.textarea{
+  margin-top: 30rpx;
+  border: 1rpx solid gainsboro;
+  padding:5rpx;
+  box-sizing: border-box;
+  border-radius: 5rpx;
+}
+
+
+
+/* components/pagination/pagination.wxss */
+view,text,image{
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
+}
+.page-control{
+  width: 100%;
+}
+.page-control .page-control-btns{
+  width: 100%;
+  padding: 20rpx 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.page-control .page-control-btns .page-number{
+  width: 20%;
+  text-align: center;
+  color: #333;
+}
+.page-control .page-control-btns .page-number:active{
+  background-color: #ddd;
+}
+.page-control .page-control-btns .page-btn{
+  width: 30%;
+  padding: 15rpx 20rpx;
+  font-size: 30rpx;
+  background-color: #0099CC;
+  color: #fff;
+  border-radius: 10rpx;
+  text-align: center;
+}
+.page-control .page-control-btns .page-btn:active{
+  opacity: .5;
+}
+.page-control .page-control-btns .btn-disabled{
+  background-color: #ddd;
+  color: #999;
+}
+.page-container{
+  position: fixed;
+  top: 0rpx;
+  left: 0rpx;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+}
+.page-mask{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background-color: rgba(0,0,0,0.5);
+}
+.page-popup{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: center;
+}
+.page-popup-box{
+  width: 60%;
+  margin: 0 auto;
+  background-color: #fff;
+  height: 60%;
+  border-radius: 10rpx;
+  z-index: 9999;
+  overflow: auto;
+}
+.page-line{
+  width: 100%;
+  height: 80rpx;
+  line-height: 80rpx;
+  padding: 0rpx 20rpx;
+  border-bottom: 1rpx solid #e2e2e2;
+}
+.page-line:active{
+  background-color: #ddd;
+}
diff --git a/GoldC/utils/bmap-wx.js b/GoldC/utils/bmap-wx.js
index be7c7d0..0119ef4 100644
--- a/GoldC/utils/bmap-wx.js
+++ b/GoldC/utils/bmap-wx.js
@@ -32,12 +32,12 @@
         success = success || function () {};
         fail = fail || function () {};
         complete = complete || function () {};
-        // wx.getLocation({
-        //     type: type,
-        //     success: success,
-        //     fail: fail,
-        //     complete:complete
-        // });
+        wx.getLocation({
+            type: type,
+            success: success,
+            fail: fail,
+            complete:complete
+        });
     }
 
     /**

--
Gitblit v1.8.0