Просмотр исходного кода

经营概况、进入小程序存入(vuex)所有门店、确认开单、组合开单金额,风格选择、去除采购库存不足提示、删除、新增、修改培训班清除缓存的培训班列表、

jiangfeng 5 лет назад
Родитель
Сommit
79d7825396
52 измененных файлов с 206 добавлено и 166 удалено
  1. 60 58
      ghsApp/dist/dev/mp-weixin/project.config.json
  2. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/admin/billing/affirmGoods.js.map
  3. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/admin/billing/index.js.map
  4. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  5. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  6. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/date-picker.js.map
  7. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/half-picker.js.map
  8. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/linkage-picker.js.map
  9. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/range-picker.js.map
  10. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/region-picker.js.map
  11. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/selector-picker.js.map
  12. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/shortterm-picker.js.map
  13. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/time-picker.js.map
  14. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/w-picker.js.map
  15. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/pagesPurchase/ghsProduct.js.map
  16. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/pagesStatistics/business.js.map
  17. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/pagesStatistics/trainingClass.js.map
  18. 0 0
      hdApp/dist/dev/.sourcemap/mp-weixin/pagesStatistics/trainingClassEdit.js.map
  19. 1 1
      hdApp/dist/dev/mp-weixin/admin/billing/affirmGoods.js
  20. 0 0
      hdApp/dist/dev/mp-weixin/admin/billing/affirmGoods.wxml
  21. 0 0
      hdApp/dist/dev/mp-weixin/admin/billing/index.wxml
  22. 2 2
      hdApp/dist/dev/mp-weixin/admin/home/components/plugin/timeaxis-item.json
  23. 2 1
      hdApp/dist/dev/mp-weixin/app.json
  24. 0 0
      hdApp/dist/dev/mp-weixin/common/vendor.js
  25. 2 2
      hdApp/dist/dev/mp-weixin/components/app-img.json
  26. 2 2
      hdApp/dist/dev/mp-weixin/components/module/allMoreSelectInput.json
  27. 2 2
      hdApp/dist/dev/mp-weixin/components/module/app-avatar.json
  28. 2 2
      hdApp/dist/dev/mp-weixin/components/module/app-close.json
  29. 2 2
      hdApp/dist/dev/mp-weixin/components/module/app-search.json
  30. 2 2
      hdApp/dist/dev/mp-weixin/components/module/app-share-mask.json
  31. 2 2
      hdApp/dist/dev/mp-weixin/components/plugin/alert.json
  32. 2 2
      hdApp/dist/dev/mp-weixin/components/plugin/badge.json
  33. 2 2
      hdApp/dist/dev/mp-weixin/components/plugin/selectList.json
  34. 2 2
      hdApp/dist/dev/mp-weixin/components/plugin/tabs.json
  35. 2 2
      hdApp/dist/dev/mp-weixin/pagesInvite/inviteItem.json
  36. 2 2
      hdApp/dist/dev/mp-weixin/pagesOrder/components/stepStatus.json
  37. 2 2
      hdApp/dist/dev/mp-weixin/pagesPurchase/components/gatheringList.json
  38. 0 0
      hdApp/dist/dev/mp-weixin/pagesPurchase/ghsProduct.js
  39. 5 6
      hdApp/dist/dev/mp-weixin/pagesStatistics/business.js
  40. 2 1
      hdApp/dist/dev/mp-weixin/pagesStatistics/business.wxss
  41. 8 8
      hdApp/dist/dev/mp-weixin/pagesStatistics/trainingClass.js
  42. 0 0
      hdApp/dist/dev/mp-weixin/pagesStatistics/trainingClassEdit.js
  43. 32 30
      hdApp/dist/dev/mp-weixin/project.config.json
  44. 4 0
      hdApp/src/App.vue
  45. 2 2
      hdApp/src/admin/billing/affirmGoods.vue
  46. 2 1
      hdApp/src/admin/billing/index.vue
  47. 44 24
      hdApp/src/mixins/product.js
  48. 1 0
      hdApp/src/pagesPurchase/ghsProduct.vue
  49. 8 3
      hdApp/src/pagesStatistics/business.vue
  50. 2 3
      hdApp/src/pagesStatistics/trainingClass.vue
  51. 1 0
      hdApp/src/pagesStatistics/trainingClassEdit.vue
  52. 4 0
      hdApp/src/utils/auth.js

+ 60 - 58
ghsApp/dist/dev/mp-weixin/project.config.json

@@ -1,60 +1,62 @@
 {
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": false,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx21b7c3ef12082099",
-  "projectname": "%E4%BE%9B%E8%B4%A7%E5%95%86",
-  "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
-    }
-  }
+	"description": "项目配置文件。",
+	"packOptions": {
+		"ignore": []
+	},
+	"setting": {
+		"urlCheck": false,
+		"es6": true,
+		"enhance": false,
+		"postcss": true,
+		"preloadBackgroundData": false,
+		"minified": true,
+		"newFeature": false,
+		"coverView": true,
+		"nodeModules": false,
+		"autoAudits": false,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"uglifyFileName": false,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"compileHotReLoad": false,
+		"useMultiFrameRuntime": true,
+		"useApiHook": true,
+		"useApiHostProcess": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"enableEngineNative": false,
+		"bundle": false,
+		"useIsolateContext": true,
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"userConfirmedBundleSwitch": false,
+		"packNpmManually": false,
+		"packNpmRelationList": [],
+		"minifyWXSS": true
+	},
+	"compileType": "miniprogram",
+	"libVersion": "",
+	"appid": "wx21b7c3ef12082099",
+	"projectname": "%E4%BE%9B%E8%B4%A7%E5%95%86",
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
+	"condition": {
+		"search": {
+			"list": []
+		},
+		"conversation": {
+			"list": []
+		},
+		"game": {
+			"list": []
+		},
+		"miniprogram": {
+			"list": []
+		}
+	}
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/admin/billing/affirmGoods.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/admin/billing/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/date-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/half-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/linkage-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/range-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/region-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/selector-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/shortterm-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/time-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/components/w-picker/w-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/pagesPurchase/ghsProduct.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/pagesStatistics/business.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/pagesStatistics/trainingClass.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/.sourcemap/mp-weixin/pagesStatistics/trainingClassEdit.js.map


+ 1 - 1
hdApp/dist/dev/mp-weixin/admin/billing/affirmGoods.js

@@ -14,7 +14,7 @@
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--14-0!./node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./src/admin/billing/affirmGoods.vue?vue&type=template&id=6b5a5fc1&scoped=true& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-/*! exports provided: render, staticRenderFns, recyclableRender, components */function(e,n,t){"use strict";var o;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return c})),t.d(n,"recyclableRender",(function(){return i})),t.d(n,"components",(function(){return o}));var r=function(){var e=this,n=e.$createElement,t=(e._self._c,e.__map(e.selectList,(function(n,t){var o=e.__get_orig(n),r=e.getSelectGoodsPrice(n);return{$orig:o,m0:r}}))),o=Number(e.freight),r=Number(e.allGoodsPrice);e._isMounted||(e.e0=function(n){e.showCustomer=!0},e.e1=function(n){e.showCustomer=!0},e.e2=function(n,t){var o=arguments[arguments.length-1].currentTarget.dataset,r=o.eventParams||o["event-params"];t=r.res;e.payType=t.id}),e.$mp.data=Object.assign({},{$root:{l0:t,m1:o,m2:r}})},i=!1,c=[];r._withStripped=!0},660:
+/*! exports provided: render, staticRenderFns, recyclableRender, components */function(e,n,t){"use strict";var o;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return c})),t.d(n,"recyclableRender",(function(){return i})),t.d(n,"components",(function(){return o}));var r=function(){var e=this,n=e.$createElement,t=(e._self._c,e.__map(e.selectList,(function(n,t){var o=e.__get_orig(n),r=e.getSelectGoodsPrice(n);return{$orig:o,m0:r}}))),o=Number(e.freight),r=Number(e.allGoodsPriceFun);e._isMounted||(e.e0=function(n){e.showCustomer=!0},e.e1=function(n){e.showCustomer=!0},e.e2=function(n,t){var o=arguments[arguments.length-1].currentTarget.dataset,r=o.eventParams||o["event-params"];t=r.res;e.payType=t.id}),e.$mp.data=Object.assign({},{$root:{l0:t,m1:o,m2:r}})},i=!1,c=[];r._withStripped=!0},660:
 /*!********************************************************************!*\
   !*** ./src/admin/billing/affirmGoods.vue?vue&type=script&lang=js& ***!
   \********************************************************************/

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/mp-weixin/admin/billing/affirmGoods.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/mp-weixin/admin/billing/index.wxml


+ 2 - 2
hdApp/dist/dev/mp-weixin/admin/home/components/plugin/timeaxis-item.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 1
hdApp/dist/dev/mp-weixin/app.json

@@ -320,5 +320,6 @@
     "t-tr": "/components/plugin/t-table/t-tr",
     "t-th": "/components/plugin/t-table/t-th",
     "t-td": "/components/plugin/t-table/t-td"
-  }
+  },
+  "sitemapLocation": "sitemap.json"
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/mp-weixin/common/vendor.js


+ 2 - 2
hdApp/dist/dev/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/module/allMoreSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/module/app-avatar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/module/app-share-mask.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/plugin/badge.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/components/plugin/tabs.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
hdApp/dist/dev/mp-weixin/pagesPurchase/components/gatheringList.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/mp-weixin/pagesPurchase/ghsProduct.js


Разница между файлами не показана из-за своего большого размера
+ 5 - 6
hdApp/dist/dev/mp-weixin/pagesStatistics/business.js


+ 2 - 1
hdApp/dist/dev/mp-weixin/pagesStatistics/business.wxss

@@ -271,7 +271,8 @@
   -webkit-box-pack: center;
   -webkit-justify-content: center;
           justify-content: center;
-  width: 165rpx;
+  padding: 0rpx 17rpx;
+  /*width: 165upx;*/
   height: 44rpx;
 }
 .business-page .business-info .amount-view .amount-btn.data-v-0f2f6354 .select-title {

+ 8 - 8
hdApp/dist/dev/mp-weixin/pagesStatistics/trainingClass.js

@@ -2,33 +2,33 @@
 /*!****************************************************************!*\
   !*** ./src/main.js?{"page":"pagesStatistics%2FtrainingClass"} ***!
   \****************************************************************/
-/*! no static exports found */function(n,t,e){"use strict";(function(n){e(/*! uni-pages */4);i(e(/*! vue */2));var t=i(e(/*! ./pagesStatistics/trainingClass.vue */1020));function i(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e(/*! ./node_modules/_@dcloudio_uni-mp-weixin@2.0.0-31620210325001@@dcloudio/uni-mp-weixin/dist/index.js */1)["createPage"])},1020:
+/*! no static exports found */function(t,n,e){"use strict";(function(t){e(/*! uni-pages */4);i(e(/*! vue */2));var n=i(e(/*! ./pagesStatistics/trainingClass.vue */1020));function i(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e(/*! ./node_modules/_@dcloudio_uni-mp-weixin@2.0.0-31620210325001@@dcloudio/uni-mp-weixin/dist/index.js */1)["createPage"])},1020:
 /*!***********************************************!*\
   !*** ./src/pagesStatistics/trainingClass.vue ***!
   \***********************************************/
-/*! no static exports found */function(n,t,e){"use strict";e.r(t);var i=e(/*! ./trainingClass.vue?vue&type=template&id=45295f18&scoped=true& */1021),o=e(/*! ./trainingClass.vue?vue&type=script&lang=js& */1023);for(var c in o)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(c);e(/*! ./trainingClass.vue?vue&type=style&index=0&id=45295f18&lang=scss&scoped=true& */1025);var r,a=e(/*! ../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */53),u=Object(a["default"])(o["default"],i["render"],i["staticRenderFns"],!1,null,"45295f18",null,!1,i["components"],r);u.options.__file="pagesStatistics/trainingClass.vue",t["default"]=u.exports},1021:
+/*! no static exports found */function(t,n,e){"use strict";e.r(n);var i=e(/*! ./trainingClass.vue?vue&type=template&id=45295f18&scoped=true& */1021),r=e(/*! ./trainingClass.vue?vue&type=script&lang=js& */1023);for(var o in r)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(o);e(/*! ./trainingClass.vue?vue&type=style&index=0&id=45295f18&lang=scss&scoped=true& */1025);var a,c=e(/*! ../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */53),s=Object(c["default"])(r["default"],i["render"],i["staticRenderFns"],!1,null,"45295f18",null,!1,i["components"],a);s.options.__file="pagesStatistics/trainingClass.vue",n["default"]=s.exports},1021:
 /*!******************************************************************************************!*\
   !*** ./src/pagesStatistics/trainingClass.vue?vue&type=template&id=45295f18&scoped=true& ***!
   \******************************************************************************************/
-/*! exports provided: render, staticRenderFns, recyclableRender, components */function(n,t,e){"use strict";e.r(t);var i=e(/*! -!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--14-0!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/template.js!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./trainingClass.vue?vue&type=template&id=45295f18&scoped=true& */1022);e.d(t,"render",(function(){return i["render"]})),e.d(t,"staticRenderFns",(function(){return i["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return i["recyclableRender"]})),e.d(t,"components",(function(){return i["components"]}))},1022:
+/*! exports provided: render, staticRenderFns, recyclableRender, components */function(t,n,e){"use strict";e.r(n);var i=e(/*! -!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--14-0!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/template.js!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./trainingClass.vue?vue&type=template&id=45295f18&scoped=true& */1022);e.d(n,"render",(function(){return i["render"]})),e.d(n,"staticRenderFns",(function(){return i["staticRenderFns"]})),e.d(n,"recyclableRender",(function(){return i["recyclableRender"]})),e.d(n,"components",(function(){return i["components"]}))},1022:
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--14-0!./node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./src/pagesStatistics/trainingClass.vue?vue&type=template&id=45295f18&scoped=true& ***!
   \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-/*! exports provided: render, staticRenderFns, recyclableRender, components */function(n,t,e){"use strict";var i;e.r(t),e.d(t,"render",(function(){return o})),e.d(t,"staticRenderFns",(function(){return r})),e.d(t,"recyclableRender",(function(){return c})),e.d(t,"components",(function(){return i}));var o=function(){var n=this,t=n.$createElement;n._self._c},c=!1,r=[];o._withStripped=!0},1023:
+/*! exports provided: render, staticRenderFns, recyclableRender, components */function(t,n,e){"use strict";var i;e.r(n),e.d(n,"render",(function(){return r})),e.d(n,"staticRenderFns",(function(){return a})),e.d(n,"recyclableRender",(function(){return o})),e.d(n,"components",(function(){return i}));var r=function(){var t=this,n=t.$createElement;t._self._c},o=!1,a=[];r._withStripped=!0},1023:
 /*!************************************************************************!*\
   !*** ./src/pagesStatistics/trainingClass.vue?vue&type=script&lang=js& ***!
   \************************************************************************/
-/*! no static exports found */function(n,t,e){"use strict";e.r(t);var i=e(/*! -!../../node_modules/_babel-loader@8.2.2@babel-loader/lib!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/script.js!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./trainingClass.vue?vue&type=script&lang=js& */1024),o=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(c);t["default"]=o.a},1024:
+/*! no static exports found */function(t,n,e){"use strict";e.r(n);var i=e(/*! -!../../node_modules/_babel-loader@8.2.2@babel-loader/lib!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/script.js!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./trainingClass.vue?vue&type=script&lang=js& */1024),r=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=r.a},1024:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/_babel-loader@8.2.2@babel-loader/lib!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./src/pagesStatistics/trainingClass.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-/*! no static exports found */function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=e(/*! @/api/product/index */275),o={components:{},data:function(){return{shopList:[]}},mounted:function(){this.getData()},methods:{getData:function(){var n=this;(0,i.getPxClassDataApi)().then((function(t){console.log(t),n.shopList=t.data.list})).catch((function(n){console.log(n)}))},editItem:function(t){n.navigateTo({url:"/pagesStatistics/trainingClassEdit?id="+t})},addItem:function(){n.navigateTo({url:"/pagesStatistics/trainingClassEdit"})},delItem:function(t){var e=this;n.showModal({content:"确定要删除吗?",success:function(n){n.confirm?(console.log("用户点击确定"),(0,i.pxClassDel)({id:t}).then((function(n){console.log(n),e.getData()})).catch((function(n){console.log(n)}))):n.cancel}})}}};t.default=o}).call(this,e(/*! ./node_modules/_@dcloudio_uni-mp-weixin@2.0.0-31620210325001@@dcloudio/uni-mp-weixin/dist/index.js */1)["default"])},1025:
+/*! no static exports found */function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=e(/*! @/api/product/index */275),r={components:{},data:function(){return{shopList:[]}},mounted:function(){this.getData()},methods:{getData:function(){var t=this;(0,i.getPxClassDataApi)().then((function(n){console.log(n),t.shopList=n.data.list})).catch((function(t){console.log(t)}))},editItem:function(n){t.navigateTo({url:"/pagesStatistics/trainingClassEdit?id="+n})},addItem:function(){t.navigateTo({url:"/pagesStatistics/trainingClassEdit"})},delItem:function(n){var e=this;t.showModal({content:"确定要删除吗?",success:function(r){r.confirm?(0,i.pxClassDel)({id:n}).then((function(n){e.shopList=[],t.removeStorageSync("pxClassInfoList"),e.getData()})).catch((function(t){console.log(t)})):r.cancel}})}}};n.default=r}).call(this,e(/*! ./node_modules/_@dcloudio_uni-mp-weixin@2.0.0-31620210325001@@dcloudio/uni-mp-weixin/dist/index.js */1)["default"])},1025:
 /*!*********************************************************************************************************!*\
   !*** ./src/pagesStatistics/trainingClass.vue?vue&type=style&index=0&id=45295f18&lang=scss&scoped=true& ***!
   \*********************************************************************************************************/
-/*! no static exports found */function(n,t,e){"use strict";e.r(t);var i=e(/*! -!../../node_modules/_mini-css-extract-plugin@0.9.0@mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../node_modules/_css-loader@3.6.0@css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../node_modules/_postcss-loader@3.0.0@postcss-loader/src??ref--8-oneOf-1-3!../../node_modules/_sass-loader@8.0.2@sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./trainingClass.vue?vue&type=style&index=0&id=45295f18&lang=scss&scoped=true& */1026),o=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(c);t["default"]=o.a},1026:
+/*! no static exports found */function(t,n,e){"use strict";e.r(n);var i=e(/*! -!../../node_modules/_mini-css-extract-plugin@0.9.0@mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../node_modules/_css-loader@3.6.0@css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../node_modules/_postcss-loader@3.0.0@postcss-loader/src??ref--8-oneOf-1-3!../../node_modules/_sass-loader@8.0.2@sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./trainingClass.vue?vue&type=style&index=0&id=45295f18&lang=scss&scoped=true& */1026),r=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=r.a},1026:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/_mini-css-extract-plugin@0.9.0@mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/_css-loader@3.6.0@css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/_postcss-loader@3.0.0@postcss-loader/src??ref--8-oneOf-1-3!./node_modules/_sass-loader@8.0.2@sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/_@dcloudio_vue-cli-plugin-uni@2.0.0-31620210325001@@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/_@dcloudio_webpack-uni-mp-loader@2.0.0-31620210325001@@dcloudio/webpack-uni-mp-loader/lib/style.js!./src/pagesStatistics/trainingClass.vue?vue&type=style&index=0&id=45295f18&lang=scss&scoped=true& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-/*! no static exports found */function(n,t,e){}},[[1019,"common/runtime","common/vendor"]]]);
+/*! no static exports found */function(t,n,e){}},[[1019,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pagesStatistics/trainingClass.js.map

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/dev/mp-weixin/pagesStatistics/trainingClassEdit.js


+ 32 - 30
hdApp/dist/dev/mp-weixin/project.config.json

@@ -1,32 +1,34 @@
 {
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wxe4675bab299a52f7",
-  "projectname": "零售",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
-  }
+	"description": "项目配置文件。",
+	"packOptions": {
+		"ignore": []
+	},
+	"setting": {
+		"urlCheck": false,
+		"es6": true
+	},
+	"compileType": "miniprogram",
+	"libVersion": "",
+	"appid": "wxe4675bab299a52f7",
+	"projectname": "mp-weixin",
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
+	"condition": {
+		"search": {
+			"current": -1,
+			"list": []
+		},
+		"conversation": {
+			"current": -1,
+			"list": []
+		},
+		"game": {
+			"current": -1,
+			"list": []
+		},
+		"miniprogram": {
+			"current": -1,
+			"list": []
+		}
+	}
 }

+ 4 - 0
hdApp/src/App.vue

@@ -26,6 +26,10 @@ export default {
           ...res.data.dict,
           ...res.data
         })
+							store.commit('setMyShopInfo', {
+								...res.data.shop,
+								...res.data
+							})
       })
     }
     // #endif

+ 2 - 2
hdApp/src/admin/billing/affirmGoods.vue

@@ -42,7 +42,7 @@
 							<view class="describe-view">
 								共{{ allCount }}种,
 								<!-- 共16扎9支, -->
-								合计 ¥<text class="price">{{ allGoodsPrice }}</text>
+								合计 ¥<text class="price">{{ allGoodsPriceFun }}</text>
 							</view>
 						</view>
 					</view>
@@ -79,7 +79,7 @@
 			<view class="price-view">
 				<text class="price-title">收款</text>
 				<text class="price-number">
-					¥ <text class="large">{{ Number(freight)+Number(allGoodsPrice)  }}</text>
+					¥ <text class="large">{{ Number(freight)+Number(allGoodsPriceFun)  }}</text>
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>

+ 2 - 1
hdApp/src/admin/billing/index.vue

@@ -138,7 +138,8 @@
 			padding="30rpx 30rpx"
 		>
 		</modal-module>
-		<FooterCart :price="allGoodsPrice" :count="allGoodsCount" @confirm="confirmSelectGoodsEvent" v-if="tabIndex == 0"></FooterCart>
+		<!--<FooterCart :price="allGoodsPrice" :count="allGoodsCount" @confirm="confirmSelectGoodsEvent" v-if="tabIndex == 0"></FooterCart>-->
+		<FooterCart :price="allGoodsPriceFun" :count="allGoodsCount" @confirm="confirmSelectGoodsEvent" v-if="tabIndex == 0"></FooterCart>
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" v-if="tabIndex == 1"></FooterCart>
 	</view>
 </template>

+ 44 - 24
hdApp/src/mixins/product.js

@@ -176,6 +176,20 @@ export default {
 
 			}
 
+			return Math.round(price * 100) / 100;
+		},
+		allGoodsPriceFun() {
+			let price = 0;
+				for (const item of this.selectList) {
+					if(item.goodsStyle==0){
+						price += item.bigCount * Number(item.price);
+					}else{
+						price += item.bigCount * Number(item.goodsStyleList[item.goodsStyleSelectIndex].price);
+					}
+				}
+
+
+
 			return Math.round(price * 100) / 100;
 		},
 		/**
@@ -395,31 +409,33 @@ export default {
 				const element = list[index];
 				if (element.id == item.id && element.classId == item.classId) {
 					has = true;
-					if (this.isLimit) {
-						if (element.bigCount < item.bigNum) {
-							list[index] = { ...element, bigCount: ++element.bigCount };
-						}
-						//  else if (element.smallCount < item.smallNum) {
-						// 	list[index] = { ...element, smallCount: ++element.smallCount };
-						// }
-					} else {
+					if(this.offVerifyRepertory){//盘点页面没有库存验证
 						list[index] = { ...element, bigCount: ++element.bigCount };
-					}
-
-					if (this.isLimit) {
-						const { bigCount, smallCount } = list[index];
-						//超过库存时 设置为库存最大值
-						const ratio = Number(item.ratio);
-						if (
-							Number(bigCount) * ratio + Number(smallCount) >
-							Number(item.bigNum) * ratio + Number(item.smallNum)
-						) {
-							list[index].bigCount = Number(item.bigNum);
-							list[index].smallCount = Number(item.smallNum);
-							this.$msg("库存不足");
+					}else {
+						if (this.isLimit) {
+							if (element.bigCount < item.bigNum) {
+								list[index] = {...element, bigCount: ++element.bigCount};
+							}
+							//  else if (element.smallCount < item.smallNum) {
+							// 	list[index] = { ...element, smallCount: ++element.smallCount };
+							// }
+						} else {
+							list[index] = {...element, bigCount: ++element.bigCount};
+						}
+						if (this.isLimit) {
+							const {bigCount, smallCount} = list[index];
+							//超过库存时 设置为库存最大值
+							const ratio = Number(item.ratio);
+							if (
+								Number(bigCount) * ratio + Number(smallCount) >
+								Number(item.bigNum) * ratio + Number(item.smallNum)
+							) {
+								list[index].bigCount = Number(item.bigNum);
+								list[index].smallCount = Number(item.smallNum);
+								this.$msg("库存不足");
+							}
 						}
 					}
-
 					break;
 				}
 			}
@@ -446,7 +462,11 @@ export default {
 				if (info.bigNum && info.bigNum > 0) {
 					list.push(params);
 				} else {
-					this.$msg("库存不足");
+					if(this.offVerifyRepertory){//盘点页面没有库存验证
+						list.push(params);
+					}else{
+						this.$msg("库存不足");
+					}
 				}
 			}
 
@@ -595,7 +615,7 @@ export default {
 		addGoodsEvent(item) {
 			const list = this.selectList;
 			//过滤空数据
-			if(item.bigCount==0||!item.bigCount){return}
+			// if(item.bigCount==0||!item.bigCount){return}
 			let has = false;
 			for (let index = 0; index < list.length; index++) {
 				const element = list[index];

+ 1 - 0
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -136,6 +136,7 @@ export default {
 	data() {
 		return {
 			COMMODITY_TYPE,
+			offVerifyRepertory:true,//关闭库存验证
 			isGhsProduct:true,//采购进店开单
 			isModel: false,
 			customData: {

+ 8 - 3
hdApp/src/pagesStatistics/business.vue

@@ -176,12 +176,16 @@
 import {getMainProfile} from '@/api/statistics'
 import DorpdownSelect from "@/components/module/dorpdownSelect";
 import { selectShop } from '@/mixins'
+import {mapGetters} from "vuex";
 export default {
 	name:'Business',
 	components:{
 		DorpdownSelect
 	},
 	mixins:[selectShop],
+	computed:{
+		...mapGetters(["getMyShopInfo"]),
+	},
 	data() {
 		return {
 			curTabIndex: 0,
@@ -209,7 +213,8 @@ export default {
 	},
 	methods:{
 		async init(){
-				this.shopId = this.userInfo.id
+				// this.shopId = this.userInfo.id
+			this.shopId = id?id:this.getMyShopInfo.id
 				uni.showLoading({
 					title: '加载中'
 				});
@@ -433,8 +438,8 @@ export default {
 				display: flex;
 				align-items: center;
 				justify-content: center;
-			// 	// padding: 0px 17px;
-				width: 165upx;
+				padding: 0px 17px;
+				/*width: 165upx;*/
 				height: 44upx;
 				& /deep/ .select-title {
 					color: #FFFFFF;

+ 2 - 3
hdApp/src/pagesStatistics/trainingClass.vue

@@ -75,13 +75,12 @@ export default {
     delItem (id) {
       let that = this
       uni.showModal({
-        // title: '提示',
         content: '确定要删除吗?',
         success: function (res) {
           if (res.confirm) {
-            console.log('用户点击确定');
             pxClassDel({ id }).then(res => {
-              console.log(res)
+            	that.shopList = [];
+													uni.removeStorageSync('pxClassInfoList');
               that.getData()
             }).catch(err => { console.log(err) })
           } else if (res.cancel) {

+ 1 - 0
hdApp/src/pagesStatistics/trainingClassEdit.vue

@@ -212,6 +212,7 @@ export default {
         this.form.id = this.option.id;
       }
       hostFn(this.form).then(res => {
+								uni.removeStorageSync('pxClassInfoList');
         let promptText = this.option.id ? "修改成功!" : "添加成功!";
         this.$msg(promptText);
         setTimeout(() => {

+ 4 - 0
hdApp/src/utils/auth.js

@@ -106,6 +106,10 @@ export async function wxLoginFn(update) {
 									...res.data.dict,
 									...res.data
 								})
+								store.commit('setMyShopInfo', {
+									...res.data.shop,
+									...res.data
+								})
 						})
 					store.commit('setLoginInfo', {
 						...subRes.data.admin,

Некоторые файлы не были показаны из-за большого количества измененных файлов