Explorar o código

update cash back.

qd hai 1 ano
pai
achega
8ec3ccd882
Modificáronse 33 ficheiros con 316 adicións e 470 borrados
  1. 0 20
      .env
  2. 6 1
      locale/en.json
  3. 5 0
      locale/zh-Hans.json
  4. 2 2
      manifest.json
  5. 13 13
      node_modules/.vite/deps/_metadata.json
  6. 1 1
      node_modules/.vite/deps/dayjs.js
  7. 7 7
      node_modules/.vite/deps/dayjs_locale_zh-cn.js
  8. 2 2
      node_modules/.vite/deps/dayjs_locale_zh-cn.js.map
  9. 2 2
      node_modules/.vite/deps/dayjs_plugin_duration.js
  10. 1 1
      node_modules/.vite/deps/dayjs_plugin_duration.js.map
  11. 2 2
      node_modules/.vite/deps/dayjs_plugin_relativeTime.js
  12. 1 1
      node_modules/.vite/deps/dayjs_plugin_relativeTime.js.map
  13. 202 248
      node_modules/.vite/deps/lodash.js
  14. 2 2
      node_modules/.vite/deps/lodash.js.map
  15. 15 45
      node_modules/.vite/deps/luch-request.js
  16. 2 2
      node_modules/.vite/deps/luch-request.js.map
  17. 1 1
      node_modules/.vite/deps/pinia-plugin-persist-uni.js
  18. 1 1
      node_modules/.vite/deps/pinia-plugin-persist-uni.js.map
  19. 32 97
      node_modules/.vite/deps/qs-canvas.js
  20. 3 3
      node_modules/.vite/deps/qs-canvas.js.map
  21. 3 3
      node_modules/.vite/deps/weixin-js-sdk.js
  22. 1 1
      node_modules/.vite/deps/weixin-js-sdk.js.map
  23. 2 2
      pages/user/invoice/edit.vue
  24. 3 3
      pages/user/invoice/list.vue
  25. 3 3
      sheep/components/s-wallet-card/s-wallet-card.vue
  26. 1 1
      sheep/request/index.js
  27. BIN=BIN
      unpackage/dist/build/h5/assets/OPPOSANS-M-subfont-b8cdc8b8.ttf
  28. 0 1
      unpackage/dist/build/h5/assets/_plugin-vue_export-helper.1b428a4d.js
  29. 0 1
      unpackage/dist/build/h5/assets/index-73213ee9.css
  30. 0 0
      unpackage/dist/build/h5/assets/su-sticky-e3b0c442.css
  31. 0 1
      unpackage/dist/build/h5/assets/uni.2cce5d32.css
  32. BIN=BIN
      unpackage/dist/build/h5/assets/uniicons-89ed7d6d.ttf
  33. 3 3
      unpackage/dist/build/h5/index.html

+ 0 - 20
.env

@@ -1,20 +0,0 @@
-# 版本号
-SHOPRO_VERSION = v3.0.0.3
-
-# 正式环境接口域名
-SHOPRO_BASE_URL = http://8.217.120.52:882
-
-# 开发环境接口域名
-SHOPRO_DEV_BASE_URL = http://8.217.120.52:882
-
-# 开发环境运行端口
-SHOPRO_DEV_PORT = 3000
-
-# 接口地址前缀
-SHOPRO_API_PATH = /addons/shopro/
-
-# 客户端静态资源地址 空=默认使用服务端指定的CDN资源地址前缀 | local=本地  |  http(s)://xxx.xxx=自定义静态资源地址前缀
-SHOPRO_STATIC_URL = 
-
-# 是否开启直播  1 开启直播 | 0 关闭直播 (小程序官方后台未审核开通直播权限时请勿开启)
-SHOPRO_MPLIVE_ON = 0

+ 6 - 1
locale/en.json

@@ -532,6 +532,7 @@
   "public.feedback.product": "Feedback on product function issues",
   "public.feedback.advice": "Suggestions and feedback",
   "public.setting.title": "System Settings",
+  "public.setting.logout": "Logout",
   "public.feedback.version": "Current version",
   "public.feedback.session": "Local cache",
   "public.feedback.feedback": "Feedback",
@@ -611,8 +612,11 @@
   "user.address.importWxAddress": "Import WeChat address",
   "user.address.addAddress": "Add shipping address",
   "user.address.noData": "No shipping address yet",
+  "user.invoice.title": "Invoices",
   "user.invoice.edit": "Edit invoice",
   "user.invoice.add": "Add invoice",
+  "user.invoice.addfptt": "Add invoice header",
+  "user.invoice.noData": "No data",
   "user.invoice.type": "Invoice type",
   "user.invoice.realname": "name",
   "user.invoice.enterRealname": "Please enter your name (required)",
@@ -691,6 +695,7 @@
 	"sheep.address.choose": "Please select the shipping address",
 	"sheep.address.default": "Default",
 	"sheep.auth.noaccount": "Don't have an account yet?",
+	"sheep.auth.coupon": "Coupon",
 	"sheep.auth.register": "Register",
 	"sheep.auth.login": "Quick login",
 	"sheep.auth.or": "or",
@@ -790,7 +795,7 @@
 	"sheep.auth.toBind": "To bind",
 	"sheep.auth.tipsBind": "Click to bind your mobile phone number to ensure account security",
 	"sheep.auth.cny": "yuan",
-	"sheep.auth.balance": "Account Balance",
+	"sheep.auth.balance": "Balance",
 	"sheep.auth.point": "Points",
 	"sheep.auth.zhang": "Zhang",
 	"sheep.auth.myWallet": "my wallet",

+ 5 - 0
locale/zh-Hans.json

@@ -532,6 +532,7 @@
 	"public.feedback.product": "产品功能问题反馈",
 	"public.feedback.advice": "建议及意见反馈",
 	"public.setting.title": "系统设置",
+	"public.setting.logout": "退出登录",
 	"public.feedback.version": "当前版本",
 	"public.feedback.session": "本地缓存",
 	"public.feedback.feedback": "意见反馈",
@@ -611,8 +612,11 @@
 	"user.address.importWxAddress": "导入微信地址",
 	"user.address.addAddress": "新增收货地址",
 	"user.address.noData": "暂无收货地址",
+	"user.invoice.title": "发票管理",
 	"user.invoice.edit": "编辑发票",
 	"user.invoice.add": "新增发票",
+	"user.invoice.addfptt": "新增发票抬头",
+	"user.invoice.noData": "暂无发票",
 	"user.invoice.type": "发票类型",
 	"user.invoice.realname": "姓名",
 	"user.invoice.enterRealname": "请输入您的姓名(必填)",
@@ -692,6 +696,7 @@
 	"sheep.address.choose": "请选择收货地址",
 	"sheep.address.default": "默认",
 	"sheep.auth.noaccount": "还没有账号?",
+	"sheep.auth.coupon": "优惠券",
 	"sheep.auth.register": "立即注册",
 	"sheep.auth.login": "快捷登录",
 	"sheep.auth.or": "或",

+ 2 - 2
manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "shopro",
-    "appid" : "__UNI__80FA9D5",
+    "name" : "shopro商城",
+    "appid" : "__UNI__1432585",
     "description" : "Shopro是由SheepJS团队开发,使用Uniapp+Vue3技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。",
     "versionName" : "3.0.0",
     "versionCode" : 300,

+ 13 - 13
node_modules/.vite/deps/_metadata.json

@@ -1,65 +1,65 @@
 {
-  "hash": "14839164",
-  "browserHash": "68e27527",
+  "hash": "d678d1f1",
+  "browserHash": "56045472",
   "optimized": {
     "dayjs": {
       "src": "../../dayjs/dayjs.min.js",
       "file": "dayjs.js",
-      "fileHash": "50757744",
+      "fileHash": "21d13ab4",
       "needsInterop": true
     },
     "dayjs/locale/zh-cn": {
       "src": "../../dayjs/locale/zh-cn.js",
       "file": "dayjs_locale_zh-cn.js",
-      "fileHash": "853ca39f",
+      "fileHash": "2efaf748",
       "needsInterop": true
     },
     "dayjs/plugin/duration": {
       "src": "../../dayjs/plugin/duration.js",
       "file": "dayjs_plugin_duration.js",
-      "fileHash": "2e86a4be",
+      "fileHash": "c2d2c73f",
       "needsInterop": true
     },
     "dayjs/plugin/relativeTime": {
       "src": "../../dayjs/plugin/relativeTime.js",
       "file": "dayjs_plugin_relativeTime.js",
-      "fileHash": "f942fdb2",
+      "fileHash": "0b9e0e8d",
       "needsInterop": true
     },
     "lodash": {
       "src": "../../lodash/lodash.js",
       "file": "lodash.js",
-      "fileHash": "a5a11c48",
+      "fileHash": "3a83f9ad",
       "needsInterop": true
     },
     "luch-request": {
       "src": "../../luch-request/src/lib/luch-request.js",
       "file": "luch-request.js",
-      "fileHash": "87c6ca13",
+      "fileHash": "bf901044",
       "needsInterop": false
     },
     "pinia-plugin-persist-uni": {
       "src": "../../pinia-plugin-persist-uni/dist/pinia-persist-uni.es.js",
       "file": "pinia-plugin-persist-uni.js",
-      "fileHash": "e0ac751b",
+      "fileHash": "bb6f5c54",
       "needsInterop": false
     },
     "weixin-js-sdk": {
       "src": "../../weixin-js-sdk/index.js",
       "file": "weixin-js-sdk.js",
-      "fileHash": "b89f8af5",
+      "fileHash": "244054e8",
       "needsInterop": true
     },
     "qs-canvas": {
       "src": "../../qs-canvas/index.js",
       "file": "qs-canvas.js",
-      "fileHash": "de9ad909",
+      "fileHash": "1188140f",
       "needsInterop": true
     }
   },
   "chunks": {
-    "chunk-ZAHSCHAN": {
-      "file": "chunk-ZAHSCHAN.js"
+    "chunk-I4LT25IL": {
+      "file": "chunk-I4LT25IL.js"
     },
     "chunk-VX4GZB4L": {
       "file": "chunk-VX4GZB4L.js"

+ 1 - 1
node_modules/.vite/deps/dayjs.js

@@ -1,6 +1,6 @@
 import {
   require_dayjs_min
-} from "./chunk-ZAHSCHAN.js";
+} from "./chunk-I4LT25IL.js";
 import "./chunk-VX4GZB4L.js";
 export default require_dayjs_min();
 //# sourceMappingURL=dayjs.js.map

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 7 - 7
node_modules/.vite/deps/dayjs_locale_zh-cn.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
node_modules/.vite/deps/dayjs_locale_zh-cn.js.map


+ 2 - 2
node_modules/.vite/deps/dayjs_plugin_duration.js

@@ -2,9 +2,9 @@ import {
   __commonJS
 } from "./chunk-VX4GZB4L.js";
 
-// ../../../../php/h5mall_uniapp/node_modules/dayjs/plugin/duration.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/dayjs/plugin/duration.js
 var require_duration = __commonJS({
-  "../../../../php/h5mall_uniapp/node_modules/dayjs/plugin/duration.js"(exports, module) {
+  "D:/CHB/\u51FA\u5165\u91D11/\u5546\u57CE\u524D\u7AEF/\u524D\u7AEF/h5mall_uniapp/node_modules/dayjs/plugin/duration.js"(exports, module) {
     !function(t, s) {
       "object" == typeof exports && "undefined" != typeof module ? module.exports = s() : "function" == typeof define && define.amd ? define(s) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs_plugin_duration = s();
     }(exports, function() {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
node_modules/.vite/deps/dayjs_plugin_duration.js.map


+ 2 - 2
node_modules/.vite/deps/dayjs_plugin_relativeTime.js

@@ -2,9 +2,9 @@ import {
   __commonJS
 } from "./chunk-VX4GZB4L.js";
 
-// ../../../../php/h5mall_uniapp/node_modules/dayjs/plugin/relativeTime.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/dayjs/plugin/relativeTime.js
 var require_relativeTime = __commonJS({
-  "../../../../php/h5mall_uniapp/node_modules/dayjs/plugin/relativeTime.js"(exports, module) {
+  "D:/CHB/\u51FA\u5165\u91D11/\u5546\u57CE\u524D\u7AEF/\u524D\u7AEF/h5mall_uniapp/node_modules/dayjs/plugin/relativeTime.js"(exports, module) {
     !function(r, e) {
       "object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (r = "undefined" != typeof globalThis ? globalThis : r || self).dayjs_plugin_relativeTime = e();
     }(exports, function() {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
node_modules/.vite/deps/dayjs_plugin_relativeTime.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 202 - 248
node_modules/.vite/deps/lodash.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
node_modules/.vite/deps/lodash.js.map


+ 15 - 45
node_modules/.vite/deps/luch-request.js

@@ -1,6 +1,6 @@
 import "./chunk-VX4GZB4L.js";
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/utils.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/utils.js
 var toString = Object.prototype.toString;
 function isArray(val) {
   return toString.call(val) === "[object Array]";
@@ -56,7 +56,7 @@ function isUndefined(val) {
   return typeof val === "undefined";
 }
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/helpers/buildURL.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/helpers/buildURL.js
 function encode(val) {
   return encodeURIComponent(val).replace(/%40/gi, "@").replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "+").replace(/%5B/gi, "[").replace(/%5D/gi, "]");
 }
@@ -101,17 +101,17 @@ function buildURL(url, params, paramsSerializer) {
   return url;
 }
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/helpers/isAbsoluteURL.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/helpers/isAbsoluteURL.js
 function isAbsoluteURL(url) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url);
 }
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/helpers/combineURLs.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/helpers/combineURLs.js
 function combineURLs(baseURL, relativeURL) {
   return relativeURL ? baseURL.replace(/\/+$/, "") + "/" + relativeURL.replace(/^\/+/, "") : baseURL;
 }
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/core/buildFullPath.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/core/buildFullPath.js
 function buildFullPath(baseURL, requestedURL) {
   if (baseURL && !isAbsoluteURL(requestedURL)) {
     return combineURLs(baseURL, requestedURL);
@@ -119,7 +119,7 @@ function buildFullPath(baseURL, requestedURL) {
   return requestedURL;
 }
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/core/settle.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/core/settle.js
 function settle(resolve, reject, response) {
   const validateStatus2 = response.config.validateStatus;
   const status = response.statusCode;
@@ -130,7 +130,7 @@ function settle(resolve, reject, response) {
   }
 }
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/adapters/index.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/adapters/index.js
 var mergeKeys = (keys, config2) => {
   let config = {};
   keys.forEach((prop) => {
@@ -204,12 +204,12 @@ var adapters_default = (config) => {
   });
 };
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/core/dispatchRequest.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/core/dispatchRequest.js
 var dispatchRequest_default = (config) => {
   return adapters_default(config);
 };
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/core/InterceptorManager.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/core/InterceptorManager.js
 function InterceptorManager() {
   this.handlers = [];
 }
@@ -234,7 +234,7 @@ InterceptorManager.prototype.forEach = function forEach2(fn) {
 };
 var InterceptorManager_default = InterceptorManager;
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/core/mergeConfig.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/core/mergeConfig.js
 var mergeKeys2 = (keys, globalsConfig, config2) => {
   let config = {};
   keys.forEach((prop) => {
@@ -295,7 +295,7 @@ var mergeConfig_default = (globalsConfig, config2 = {}) => {
   return config;
 };
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/core/defaults.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/core/defaults.js
 var defaults_default = {
   baseURL: "",
   header: {},
@@ -309,11 +309,10 @@ var defaults_default = {
   validateStatus: function validateStatus(status) {
     return status >= 200 && status < 300;
   },
-  // 是否尝试将响应数据json化
   forcedJSONParsing: true
 };
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/utils/clone.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/utils/clone.js
 var clone = function() {
   "use strict";
   function _instanceof(obj, type) {
@@ -510,26 +509,12 @@ var clone = function() {
 }();
 var clone_default = clone;
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/core/Request.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/core/Request.js
 var Request = class {
-  /**
-   * @param {Object} arg - 全局配置
-   * @param {String} arg.baseURL - 全局根路径
-   * @param {Object} arg.header - 全局header
-   * @param {String} arg.method = [GET|POST|PUT|DELETE|CONNECT|HEAD|OPTIONS|TRACE] - 全局默认请求方式
-   * @param {String} arg.dataType = [json] - 全局默认的dataType
-   * @param {String} arg.responseType = [text|arraybuffer] - 全局默认的responseType。支付宝小程序不支持
-   * @param {Object} arg.custom - 全局默认的自定义参数
-   * @param {Number} arg.timeout - 全局默认的超时时间,单位 ms。默认60000。H5(HBuilderX 2.9.9+)、APP(HBuilderX 2.9.9+)、微信小程序(2.10.0)、支付宝小程序
-   * @param {Boolean} arg.sslVerify - 全局默认的是否验证 ssl 证书。默认true.仅App安卓端支持(HBuilderX 2.3.3+)
-   * @param {Boolean} arg.withCredentials - 全局默认的跨域请求时是否携带凭证(cookies)。默认false。仅H5支持(HBuilderX 2.6.15+)
-   * @param {Boolean} arg.firstIpv4 - 全DNS解析时优先使用ipv4。默认false。仅 App-Android 支持 (HBuilderX 2.8.0+)
-   * @param {Function(statusCode):Boolean} arg.validateStatus - 全局默认的自定义验证器。默认statusCode >= 200 && statusCode < 300
-   */
   constructor(arg = {}) {
     if (!isPlainObject(arg)) {
       arg = {};
-      console.warn("设置全局参数必须接收一个Object");
+      console.warn("\u8BBE\u7F6E\u5168\u5C40\u53C2\u6570\u5FC5\u987B\u63A5\u6536\u4E00\u4E2AObject");
     }
     this.config = clone_default({ ...defaults_default, ...arg });
     this.interceptors = {
@@ -537,10 +522,6 @@ var Request = class {
       response: new InterceptorManager_default()
     };
   }
-  /**
-   * @Function
-   * @param {Request~setConfigCallback} f - 设置全局默认配置
-   */
   setConfig(f) {
     this.config = f(this.config);
   }
@@ -559,17 +540,6 @@ var Request = class {
     }
     return promise;
   }
-  /**
-   * @Function
-   * @param {Object} config - 请求配置项
-   * @prop {String} options.url - 请求路径
-   * @prop {Object} options.data - 请求参数
-   * @prop {Object} [options.responseType = config.responseType] [text|arraybuffer] - 响应的数据类型
-   * @prop {Object} [options.dataType = config.dataType] - 如果设为 json,会尝试对返回的数据做一次 JSON.parse
-   * @prop {Object} [options.header = config.header] - 请求header
-   * @prop {Object} [options.method = config.method] - 请求方法
-   * @returns {Promise<unknown>}
-   */
   request(config = {}) {
     return this.middleware(config);
   }
@@ -651,7 +621,7 @@ var Request = class {
   }
 };
 
-// ../../../../php/h5mall_uniapp/node_modules/luch-request/src/lib/luch-request.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/luch-request/src/lib/luch-request.js
 var luch_request_default = Request;
 export {
   luch_request_default as default

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
node_modules/.vite/deps/luch-request.js.map


+ 1 - 1
node_modules/.vite/deps/pinia-plugin-persist-uni.js

@@ -1,6 +1,6 @@
 import "./chunk-VX4GZB4L.js";
 
-// ../../../../php/h5mall_uniapp/node_modules/pinia-plugin-persist-uni/dist/pinia-persist-uni.es.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/pinia-plugin-persist-uni/dist/pinia-persist-uni.es.js
 var isH5 = typeof alert === "function";
 var updateStorage = (strategy, store, options) => {
   const storage = strategy.storage;

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
node_modules/.vite/deps/pinia-plugin-persist-uni.js.map


+ 32 - 97
node_modules/.vite/deps/qs-canvas.js

@@ -5,9 +5,9 @@ import {
   __privateSet
 } from "./chunk-VX4GZB4L.js";
 
-// ../../../../php/h5mall_uniapp/node_modules/qs-canvas/index.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/qs-canvas/index.js
 var require_qs_canvas = __commonJS({
-  "../../../../php/h5mall_uniapp/node_modules/qs-canvas/index.js"(exports, module) {
+  "D:/CHB/\u51FA\u5165\u91D11/\u5546\u57CE\u524D\u7AEF/\u524D\u7AEF/h5mall_uniapp/node_modules/qs-canvas/index.js"(exports, module) {
     var QSCanvas = function() {
       var _nc;
       const platform = getPlatform(), isUni = platform == "uni", isNode = platform == "node", isWeb = platform == "web", imgCache = {}, vmCache = {}, asyncDrawWhiteList = Object.freeze([
@@ -130,7 +130,7 @@ var require_qs_canvas = __commonJS({
       function getCtx(vm, args) {
         if (isUni) {
           if (!args.canvasId) {
-            throw new Error("canvasId 不能为空");
+            throw new Error("canvasId \u4E0D\u80FD\u4E3A\u7A7A");
           }
         }
         let canvas, obj = {};
@@ -185,7 +185,7 @@ var require_qs_canvas = __commonJS({
           if (isUni)
             return;
           if (asyncDrawWhiteList.includes(i)) {
-            console.log("白名单跳过");
+            console.log("\u767D\u540D\u5355\u8DF3\u8FC7");
             return;
           }
           if (typeof this[i] == "function") {
@@ -226,9 +226,6 @@ var require_qs_canvas = __commonJS({
           this.ctx = canvasObj.ctx;
           return this;
         }
-        /**
-         * 使QSCanvas拥有原有方法
-         */
         handleCtx() {
           const ctx = this.ctx;
           const active = (i) => {
@@ -271,9 +268,6 @@ var require_qs_canvas = __commonJS({
           };
           return this;
         }
-        /**
-         * 设置画笔
-         */
         setPaintbrush(obj = {}) {
           filterPaintbrushProps(obj);
           for (const k in obj) {
@@ -281,9 +275,6 @@ var require_qs_canvas = __commonJS({
           }
           return this;
         }
-        /**
-         * 设置画笔操作兼容uni
-         */
         setPaintbrushProp(prop, data) {
           if (isNull(prop) || isNull(data))
             return;
@@ -292,7 +283,7 @@ var require_qs_canvas = __commonJS({
           if (prop == "font") {
             if (data) {
               if (typeof data != "object") {
-                console.warn("font属性需Object格式");
+                console.warn("font\u5C5E\u6027\u9700Object\u683C\u5F0F");
                 return;
               }
               for (const k in data)
@@ -305,7 +296,8 @@ var require_qs_canvas = __commonJS({
               const f = this._data.font;
               this._data.oldPaintbrushProps[prop] = f;
               const setFont = () => {
-                ctx.font = `${f.fontStyle || "normal"} ${f.fontVariant || "normal"} ${f.fontWeight || "normal"} ${f.fontSize ?? 10}px ${f.fontFamily || "sans-serif"}`;
+                var _a;
+                ctx.font = `${f.fontStyle || "normal"} ${f.fontVariant || "normal"} ${f.fontWeight || "normal"} ${(_a = f.fontSize) != null ? _a : 10}px ${f.fontFamily || "sans-serif"}`;
               };
               if (isUni) {
                 setFont();
@@ -323,9 +315,6 @@ var require_qs_canvas = __commonJS({
           }
           return this;
         }
-        /**
-         * 重置画笔
-         */
         resetPaintbrush(obj = {}) {
           this.setPaintbrush({
             fillStyle: "#000000",
@@ -352,16 +341,10 @@ var require_qs_canvas = __commonJS({
           this.setPaintbrush(paintbrushProps);
           return this;
         }
-        /**
-         * 保存画笔设置
-         */
         savePaintbrush() {
           this._data.savedPaintbrushProps.unshift({ ...this._data.oldPaintbrushProps });
           return this;
         }
-        /**
-         * 恢复上次保存的画笔设置
-         */
         restorePaintbrush() {
           const savedProps = this._data.savedPaintbrushProps.shift();
           if (savedProps)
@@ -369,9 +352,6 @@ var require_qs_canvas = __commonJS({
           this.resetPaintbrush({ ...this._data.oldPaintbrushProps });
           return this;
         }
-        /**
-         * 更新画布宽高
-         */
         updateCanvasWH(obj = {}) {
           var _a, _b, _c;
           let { width, height, delay } = obj, setCanvasWH = (_a = this._args) == null ? void 0 : _a.setCanvasWH;
@@ -380,13 +360,13 @@ var require_qs_canvas = __commonJS({
           return new Promise((rs, rj) => {
             if (isUni) {
               if (!setCanvasWH || typeof setCanvasWH != "function") {
-                rj("setCanvasWH异常, uni-app 请在初始化时传入setCanvasWH函数");
+                rj("setCanvasWH\u5F02\u5E38, uni-app \u8BF7\u5728\u521D\u59CB\u5316\u65F6\u4F20\u5165setCanvasWH\u51FD\u6570");
                 return;
               }
               setCanvasWH({ height, width });
               setTimeout(() => {
                 rs();
-              }, delay ?? 50);
+              }, delay != null ? delay : 50);
             } else {
               this.canvas.height = height;
               this.canvas.width = width;
@@ -402,16 +382,10 @@ var require_qs_canvas = __commonJS({
               this.resetPaintbrush(this._data.oldPaintbrushProps);
           });
         }
-        /**
-         * 清除画布内容
-         */
         clear() {
           this.ctx.clearRect(0, 0, this._data.width || 999999, this._data.height || 999999);
           return this;
         }
-        /**
-         * 兼容uni draw
-         */
         draw(obj = {}) {
           const { reserve } = obj;
           return new Promise((rs, rj) => {
@@ -424,7 +398,7 @@ var require_qs_canvas = __commonJS({
                   clearTimeout(settimeoutkey);
                 }
               }, 3e3);
-              this.ctx.draw(reserve ?? false, () => {
+              this.ctx.draw(reserve != null ? reserve : false, () => {
                 done = true;
                 clearTimeout(settimeoutkey);
                 rs();
@@ -463,39 +437,34 @@ var require_qs_canvas = __commonJS({
             }
           });
         }
-        /**
-         * canvas2image
-         */
         toImage(obj = {}) {
           return new Promise((rs, rj) => {
+            var _a;
             if (isUni) {
               const canvasId = this._args.canvasId;
               if (!canvasId) {
-                rj("canvasId不存在");
+                rj("canvasId\u4E0D\u5B58\u5728");
                 return;
               }
               uni.canvasToTempFilePath({
                 ...obj,
                 canvasId,
                 success: (r) => {
-                  var _a;
-                  (_a = obj.success) == null ? void 0 : _a.call(obj, r);
+                  var _a2;
+                  (_a2 = obj.success) == null ? void 0 : _a2.call(obj, r);
                   rs(r.tempFilePath);
                 },
                 fail: (err) => {
-                  var _a;
-                  (_a = obj.fail) == null ? void 0 : _a.call(obj, err);
+                  var _a2;
+                  (_a2 = obj.fail) == null ? void 0 : _a2.call(obj, err);
                   rj(err);
                 }
               }, vmCache[this._id]);
             } else {
-              rs(this.canvas.toDataURL(`image/${["jpg", "jpeg"].includes(obj.fileType) ? "jpeg" : "png"}`, obj.quality ?? 1));
+              rs(this.canvas.toDataURL(`image/${["jpg", "jpeg"].includes(obj.fileType) ? "jpeg" : "png"}`, (_a = obj.quality) != null ? _a : 1));
             }
           });
         }
-        /**
-         * 计算文字多行
-         */
         calcText(obj = {}) {
           const line = obj.line || -1;
           return new Promise((rs, rj) => {
@@ -594,15 +563,11 @@ var require_qs_canvas = __commonJS({
             }
           });
         }
-        /* 绘制 */
-        /**
-         * 绘制文本
-         */
         drawText(obj = {}) {
           return new Promise(async (rs, rj) => {
             try {
               if (!obj.val) {
-                console.warn(`需绘制的文本为空`);
+                console.warn(`\u9700\u7ED8\u5236\u7684\u6587\u672C\u4E3A\u7A7A`);
                 rs();
                 return;
               }
@@ -638,7 +603,7 @@ var require_qs_canvas = __commonJS({
         }
         drawDoubleStraightLine(obj = {}) {
           let { gap } = obj;
-          gap = gap ?? 1;
+          gap = gap != null ? gap : 1;
           this.drawStraightLine(obj);
           this.drawStraightLine({ ...obj, y1: obj.y1 + gap, y2: obj.y2 + gap });
         }
@@ -680,19 +645,10 @@ var require_qs_canvas = __commonJS({
               break;
           }
         }
-        /**
-         * { 
-        	...(drawText属性), 
-        	textDecoration: {
-        		line, //类型 同css text-decoration-line
-        		color, //线颜色
-        		width, //线宽度
-         *  }
-         * }
-         */
         drawTextDecoration(obj = {}) {
+          var _a;
           this.savePaintbrush();
-          const oldProps = this._data.oldPaintbrushProps, tw = this.measureText(obj.val).width, tD = obj.textDecoration, line = tD.line || "line-through", color = tD.color || obj.color || oldProps.fillStyle || "#000000", width = tD.thickness || tD.width || (obj.fontSize ? obj.fontSize * 0.1 : false) || 1, style = tD.style || "solide", offset = tD.offset || 0, gap = tD.gap ?? 1, fontSize = obj.fontSize || this._data.font.fontSize;
+          const oldProps = this._data.oldPaintbrushProps, tw = this.measureText(obj.val).width, tD = obj.textDecoration, line = tD.line || "line-through", color = tD.color || obj.color || oldProps.fillStyle || "#000000", width = tD.thickness || tD.width || (obj.fontSize ? obj.fontSize * 0.1 : false) || 1, style = tD.style || "solide", offset = tD.offset || 0, gap = (_a = tD.gap) != null ? _a : 1, fontSize = obj.fontSize || this._data.font.fontSize;
           this.setPaintbrush({ lineWidth: width, strokeStyle: color });
           let y = 0;
           switch (line) {
@@ -727,14 +683,11 @@ var require_qs_canvas = __commonJS({
           }
           this.restorePaintbrush();
         }
-        /**
-         * 绘制图片
-         */
         drawImg(obj = {}) {
           return new Promise(async (rs, rj) => {
             try {
               if (!obj.val) {
-                console.warn(`需绘制的图片为空`);
+                console.warn(`\u9700\u7ED8\u5236\u7684\u56FE\u7247\u4E3A\u7A7A`);
                 rs();
                 return;
               }
@@ -751,7 +704,7 @@ var require_qs_canvas = __commonJS({
           return new Promise(async (rs, rj) => {
             try {
               if (!obj.val) {
-                console.warn(`需绘制的图片为空`);
+                console.warn(`\u9700\u7ED8\u5236\u7684\u56FE\u7247\u4E3A\u7A7A`);
                 rs();
                 return;
               }
@@ -807,14 +760,10 @@ var require_qs_canvas = __commonJS({
             }
           });
         }
-        /**
-         * 绘制二维码
-         * 诗小柒 的二维码生成器代码
-         */
         drawQrCode(obj = {}) {
           return new Promise((rs, rj) => {
             if (!(obj == null ? void 0 : obj.val)) {
-              console.warn("绘制二维码val为空");
+              console.warn("\u7ED8\u5236\u4E8C\u7EF4\u7801val\u4E3A\u7A7A");
               rs();
               return;
             }
@@ -822,21 +771,13 @@ var require_qs_canvas = __commonJS({
             let qrcodeAlgObjCache = [];
             let options = {
               text: String(obj.val || "") || "",
-              // 生成内容
               size: Number(obj.size || 0) || 200,
-              // 二维码大小
               background: String(obj.background || "") || "#ffffff",
-              // 背景色
               foreground: String(obj.foreground || "") || "#000000",
-              // 前景色
               pdground: String(obj.pdground || "") || "#000000",
-              // 定位角点颜色
               correctLevel: Number(obj.correctLevel || 0) || 3,
-              // 容错级别
               dx: Number(obj.x || 0) || 0,
-              // x轴距离
               dy: Number(obj.y || 0) || 0
-              // y轴距离
             };
             let qrCodeAlg = null;
             let d = 0;
@@ -884,9 +825,6 @@ var require_qs_canvas = __commonJS({
             rs({ ...obj, height: obj.size, width: obj.size, left: obj.x, top: obj.y, right: obj.x + obj.width, bottom: obj.y + obj.size });
           });
         }
-        /**
-         * 圆形
-         */
         setCircle(obj = {}) {
           const ctx = this.ctx;
           let { x, y, d, mode } = obj;
@@ -908,9 +846,6 @@ var require_qs_canvas = __commonJS({
             ctx.clip();
           return this;
         }
-        /**
-         * 矩形
-         */
         setRect(obj = {}) {
           const ctx = this.ctx;
           const { x, y, r, height, width } = obj;
@@ -938,13 +873,10 @@ var require_qs_canvas = __commonJS({
             ctx.clip();
           return this;
         }
-        /**
-         * 加载图片
-         */
         loadImage(url) {
           return new Promise(async (resolve, reject) => {
             if (!url) {
-              console.warn("加载图片url为空");
+              console.warn("\u52A0\u8F7D\u56FE\u7247url\u4E3A\u7A7A");
               resolve();
               return;
             }
@@ -1054,14 +986,17 @@ var require_qs_canvas = __commonJS({
           return new Promise(async (rs, rj) => {
             try {
               if (!data) {
-                rj("drawArray需绘制参数不存在");
+                rj("drawArray\u9700\u7ED8\u5236\u53C2\u6570\u4E0D\u5B58\u5728");
                 return;
               }
               if (!Array.isArray(data)) {
-                rj("drawArray参数需要是Array");
+                rj("drawArray\u53C2\u6570\u9700\u8981\u662FArray");
                 return;
               }
-              data = [...data].sort((a, b) => ((a == null ? void 0 : a.zIndex) ?? 0) - ((b == null ? void 0 : b.zIndex) ?? 0));
+              data = [...data].sort((a, b) => {
+                var _a, _b;
+                return ((_a = a == null ? void 0 : a.zIndex) != null ? _a : 0) - ((_b = b == null ? void 0 : b.zIndex) != null ? _b : 0);
+              });
               const arr = [];
               for (let i = 0; i < data.length; i++) {
                 const item = data[i];
@@ -1122,7 +1057,7 @@ var require_qs_canvas = __commonJS({
         drawRichText(html) {
           return new Promise(async (rs, rj) => {
             if (!html) {
-              rj("drawRichText需绘制参数不存在");
+              rj("drawRichText\u9700\u7ED8\u5236\u53C2\u6570\u4E0D\u5B58\u5728");
               return;
             }
             if (typeof html == "string")

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 3 - 3
node_modules/.vite/deps/qs-canvas.js.map


+ 3 - 3
node_modules/.vite/deps/weixin-js-sdk.js

@@ -2,9 +2,9 @@ import {
   __commonJS
 } from "./chunk-VX4GZB4L.js";
 
-// ../../../../php/h5mall_uniapp/node_modules/weixin-js-sdk/index.js
+// D:/CHB/出入金1/商城前端/前端/h5mall_uniapp/node_modules/weixin-js-sdk/index.js
 var require_weixin_js_sdk = __commonJS({
-  "../../../../php/h5mall_uniapp/node_modules/weixin-js-sdk/index.js"(exports, module) {
+  "D:/CHB/\u51FA\u5165\u91D11/\u5546\u57CE\u524D\u7AEF/\u524D\u7AEF/h5mall_uniapp/node_modules/weixin-js-sdk/index.js"(exports, module) {
     !function(e, n) {
       module.exports = n(e);
     }(window, function(o, e) {
@@ -753,7 +753,7 @@ var require_weixin_js_sdk = __commonJS({
         }
       }
       function L() {
-        return (/* @__PURE__ */ new Date()).getTime();
+        return new Date().getTime();
       }
       function O(e2) {
         l && (o.WeixinJSBridge ? e2() : i.addEventListener && i.addEventListener("WeixinJSBridgeReady", e2, false));

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
node_modules/.vite/deps/weixin-js-sdk.js.map


+ 2 - 2
pages/user/invoice/edit.vue

@@ -138,11 +138,11 @@
   const invoiceFormRef = ref(null);
   const invoiceTypeList = [
     {
-      name: $t('user.invoice.personal'),
+      name: uni.getLocale() == 'en' ? 'Personal' : '个人',
       value: 'person',
     },
     {
-      name: $t('user.invoice.enterprise'),
+      name: uni.getLocale() == 'en' ? 'Enterprise' : '企/事业单位',
       value: 'company',
     },
   ];

+ 3 - 3
pages/user/invoice/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <s-layout title="发票管理" :bgStyle="{ color: '#FFF' }">
+  <s-layout :title="$t('user.invoice.title')" :bgStyle="{ color: '#FFF' }">
     <view v-if="state.list.length">
       <s-invoice-item
         v-for="item in state.list"
@@ -17,13 +17,13 @@
           class="add-btn ss-reset-button ui-Shadow-Main"
           @tap="sheep.$router.go('/pages/user/invoice/edit')"
         >
-          新增发票抬头
+          {{$t('user.invoice.addfptt')}}
         </button>
       </view>
     </su-fixed>
     <s-empty
       v-if="state.list.length === 0 && !state.loading"
-      text="暂无发票"
+      :text="$t('user.invoice.noData')"
       icon="/static/data-empty.png"
     />
   </s-layout>

+ 3 - 3
sheep/components/s-wallet-card/s-wallet-card.vue

@@ -6,7 +6,7 @@
     >
       <view class="value-box ss-flex ss-col-bottom">
         <view class="value-text ss-line-1">{{ userInfo.money }}</view>
-        <view class="unit-text ss-m-l-6">{{$t('sheep.auth.cny')}}</view>
+        <view class="unit-text ss-m-l-6"></view>
       </view>
       <view class="menu-title ss-m-t-28">{{$t('sheep.auth.balance')}}</view>
     </view>
@@ -24,7 +24,7 @@
     >
       <view class="value-box ss-flex ss-col-bottom">
         <view class="value-text">{{ userInfo.score }}</view>
-        <view class="unit-text ss-m-l-6"></view>
+        <view class="unit-text ss-m-l-6"></view>
       </view>
       <view class="menu-title ss-m-t-28">{{$t('sheep.auth.point')}}</view>
     </view>
@@ -38,7 +38,7 @@
     >
       <view class="value-box ss-flex ss-col-bottom">
         <view class="value-text">{{ numData.coupons_num }}</view>
-        <view class="unit-text ss-m-l-6">{{$t('sheep.auth.zhang')}}</view>
+        <view class="unit-text ss-m-l-6"></view>
       </view>
       <view class="menu-title ss-m-t-28">{{$t('sheep.auth.coupon')}}</view>
     </view>

+ 1 - 1
sheep/request/index.js

@@ -83,7 +83,7 @@ http.interceptors.request.use(
           },
         });
     }
-    const token = '1b9444cd-59b5-40f7-bf95-e2650dfedd12';//uni.getStorageSync('token');
+    const token = uni.getStorageSync('token');
     if (token) config.header['token'] = token;
     return config;
   },

BIN=BIN
unpackage/dist/build/h5/assets/OPPOSANS-M-subfont-b8cdc8b8.ttf


+ 0 - 1
unpackage/dist/build/h5/assets/_plugin-vue_export-helper.1b428a4d.js

@@ -1 +0,0 @@
-const o=(o,t)=>{const c=o.__vccOpts||o;for(const[s,n]of t)c[s]=n;return c};export{o as _};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
unpackage/dist/build/h5/assets/index-73213ee9.css


+ 0 - 0
unpackage/dist/build/h5/assets/su-sticky-e3b0c442.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
unpackage/dist/build/h5/assets/uni.2cce5d32.css


BIN=BIN
unpackage/dist/build/h5/assets/uniicons-89ed7d6d.ttf


+ 3 - 3
unpackage/dist/build/h5/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <link rel="stylesheet" href="/h5/assets/uni.2cce5d32.css">
+    <link rel="stylesheet" href="/h5/assets/uni.79134f79.css">
 
     <meta charset="UTF-8" />
     <meta
@@ -11,8 +11,8 @@
     <title>星品购666</title>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/h5/assets/index-f9853cc7.js"></script>
-    <link rel="stylesheet" href="/h5/assets/index-73213ee9.css">
+    <script type="module" crossorigin src="/h5/assets/index.fdf56543.js"></script>
+    <link rel="stylesheet" href="/h5/assets/index.81956fb0.css">
   </head>
   <body>
     <div id="app"><!--app-html--></div>