zs 2 éve
szülő
commit
3ea976e64c

+ 1 - 1
manifest.json

@@ -90,7 +90,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx23c71bee5876d1b9",
+        "appid" : "wx8cdd28824dfcdf19",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

+ 10 - 0
pagesHome/home/index.vue

@@ -138,6 +138,7 @@
 		data() {
 			return {
 				id: '',
+				tableid:'',
 				order: '0',
 				shopInfo: {},
 				list: [],
@@ -161,6 +162,8 @@
 		},
 		onLoad: async function(e) {
 			const that = this;
+			console.log(e);
+			that.$set(that, `tableid`, e.tableid);
 			that.$set(that, `id`, e.id);
 			that.$set(that, `order`, e.order);
 			that.search();
@@ -175,6 +178,13 @@
 				let res;
 				res = await that.$api(`table`, 'GET', {});
 				if (res.errcode == '0') that.$set(that, `tableList`, res.data);
+				if(that.tableid){
+					res = await that.$api(`table/${that.tableid}`, 'GET', {});
+					if (res.errcode == '0') {
+						that.$set(that.shopInfo, `table_name`, res.data.name);
+						that.$set(that.shopInfo, `table`, res.data._id);
+					}
+				}
 				res = await that.$api(`shop`, 'GET', {});
 				if (res.errcode == '0') {
 					let data = res.data[0]

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/order/add.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/order/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/order/info.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


+ 5 - 5
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1464,7 +1464,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8556,7 +8556,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8577,14 +8577,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -8670,7 +8670,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_NAME":"扫码点餐","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

+ 16 - 6
unpackage/dist/dev/mp-weixin/pagesHome/home/index.js

@@ -304,6 +304,7 @@ var _default =
   data: function data() {
     return {
       id: '',
+      tableid: '',
       order: '0',
       shopInfo: {},
       list: [],
@@ -327,9 +328,11 @@ var _default =
   },
   onLoad: function () {var _onLoad = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee(e) {var that;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
               that = this;
+              console.log(e);
+              that.$set(that, "tableid", e.tableid);
               that.$set(that, "id", e.id);
               that.$set(that, "order", e.order);
-              that.search();case 4:case "end":return _context.stop();}}}, _callee, this);}));function onLoad(_x) {return _onLoad.apply(this, arguments);}return onLoad;}(),
+              that.search();case 6:case "end":return _context.stop();}}}, _callee, this);}));function onLoad(_x) {return _onLoad.apply(this, arguments);}return onLoad;}(),
 
   onShow: function onShow() {
     var that = this;
@@ -340,14 +343,21 @@ var _default =
                 that = _this;_context2.next = 3;return (
 
                   that.$api("table", 'GET', {}));case 3:res = _context2.sent;
-                if (res.errcode == '0') that.$set(that, "tableList", res.data);_context2.next = 7;return (
-                  that.$api("shop", 'GET', {}));case 7:res = _context2.sent;
+                if (res.errcode == '0') that.$set(that, "tableList", res.data);if (!
+                that.tableid) {_context2.next = 10;break;}_context2.next = 8;return (
+                  that.$api("table/".concat(that.tableid), 'GET', {}));case 8:res = _context2.sent;
+                if (res.errcode == '0') {
+                  that.$set(that.shopInfo, "table_name", res.data.name);
+                  that.$set(that.shopInfo, "table", res.data._id);
+                }case 10:_context2.next = 12;return (
+
+                  that.$api("shop", 'GET', {}));case 12:res = _context2.sent;
                 if (res.errcode == '0') {
                   data = res.data[0];
                   // data.table_name = that.tableList[0].name
                   that.$set(that, "shopInfo", data);
-                }_context2.next = 11;return (
-                  that.$api("goodsTags", 'GET', {}));case 11:res = _context2.sent;
+                }_context2.next = 16;return (
+                  that.$api("goodsTags", 'GET', {}));case 16:res = _context2.sent;
                 if (res.errcode == '0') {
                   that.$set(that, "typeList", res.data);
                   // 查询产品
@@ -358,7 +368,7 @@ var _default =
                     title: res.errmsg,
                     icon: 'none' });
 
-                }case 13:case "end":return _context2.stop();}}}, _callee2);}))();
+                }case 18:case "end":return _context2.stop();}}}, _callee2);}))();
     },
     // 查询产品
     searchMarket: function searchMarket() {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee4() {var that, res;return _regenerator.default.wrap(function _callee4$(_context4) {while (1) {switch (_context4.prev = _context4.next) {case 0:

+ 1 - 1
unpackage/dist/dev/mp-weixin/project.config.json

@@ -19,7 +19,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.30.0",
-  "appid": "wx23c71bee5876d1b9",
+  "appid": "wx8cdd28824dfcdf19",
   "projectname": "扫码点餐",
   "condition": {},
   "editorSetting": {