From f4f427174c9579e98b1c90187f2b0344326e74f8 Mon Sep 17 00:00:00 2001 From: myTest383
Date: Mon, 16 Dec 2024 14:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 175 +++++---- common/config.js | 4 +- common/request.api.js | 2 +- components/NavBar/NavBar.vue | 6 +- custom-tab-bar/index.js | 2 +- manifest.json | 80 ++-- pages.json | 6 +- pages/SelectAddressActivity.vue | 4 +- pages/bind/bind_cloudCard.vue | 32 +- pages/good/goodsDetail.vue | 70 ++-- pages/good/goodsDetail2.vue | 15 +- pages/good/reservation.vue | 10 +- pages/good/transfer.vue | 546 +++++++++++++++++++++++++- pages/home/cloudCard2.vue | 154 ++++---- pages/home/myCellar.vue | 48 ++- pages/login/login.vue | 2 + pages/me/RealInfo.vue | 2 +- pages/me/addInvoice.vue | 23 +- pages/me/makeInvoice.vue | 14 +- pages/records/orderDetail.vue | 10 +- pages/records/orderRecords.vue | 4 +- pages/records/reservationRecords.vue | 2 +- pages/records/reservationRecords2.vue | 2 +- pages/records/reservationRecords3.vue | 2 +- pages/records/reservationRecords4.vue | 2 +- pages/records/transferRecords.vue | 2 +- pages/records/transferRecords2.vue | 2 +- 27 files changed, 893 insertions(+), 328 deletions(-) diff --git a/App.vue b/App.vue index 37dc5ca..5eca94f 100644 --- a/App.vue +++ b/App.vue @@ -1,102 +1,103 @@ \ No newline at end of file diff --git a/common/config.js b/common/config.js index 5ce3327..50267f2 100644 --- a/common/config.js +++ b/common/config.js @@ -7,10 +7,10 @@ */ module.exports = { // baseUrl: 'http://uv32vz.natappfree.cc', // 本地 - // baseUrl: 'http://192.168.0.105:7211', // 本地 + // baseUrl: 'http://192.168.0.105:8116/mall/', // 本地 // baseUrl: 'https://39.104.100.138/lpkapi', // 测试服务器 // baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器 - baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器 + baseUrl: 'https://ordermall.yxtsoft.com/lpkapi/mall', // 正式服务器 // tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 diff --git a/common/request.api.js b/common/request.api.js index db62d60..57928f9 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -134,7 +134,7 @@ export default { // 获取轮播图 bannerList: (params = {}) => request.get("/wxapi/banner/list", params), // 获取分类和品牌 - getGoodsTypeAndBrand: (params = {}) => request.get("/lpkgoods/getGoodsTypeAndBrand", {}, {}, {}, true), + getGoodsTypeAndBrand: (params = {}) => request.post("/lpkgoods/getGoodsTypeAndBrand", params, {}, {}, true), // 判断企业菜窖是否认证 isEnterprise: (params = {}) => request.get("/lpkgoods/isEnterprise/" + params.customerSid + "/" + params.brandId, + params, {}, {}, {}, true, true), diff --git a/components/NavBar/NavBar.vue b/components/NavBar/NavBar.vue index 8a24b00..f476045 100644 --- a/components/NavBar/NavBar.vue +++ b/components/NavBar/NavBar.vue @@ -54,7 +54,7 @@ /** * 全局默认背景透明，supportChange= false 会对默认色变成不透明 */ - const defaultTransparentBg = "linear-gradient(89.26deg, rgba(97,204,44,0) 0.75%,rgba(128,200,90,0) 99.78%)"; + const defaultTransparentBg = "linear-gradient(89.26deg, rgba(254,144,56,0) 0.75%,rgba(255,177,118,0) 99.78%)"; export default { name: "NavBar", @@ -161,8 +161,8 @@ */ defaultColorBgAlpha(res) { let x = this.alpha(res) - this.navBackground = "linear-gradient(89.26deg, rgba(97,204,44," + x + - ") 0.75%,rgba(128,200,90," + x + ") 99.78%)" + this.navBackground = "linear-gradient(89.26deg, rgba(254,144,56," + x + + ") 0.75%,rgba(255,177,118," + x + ") 99.78%)" }, clickIcon() { // uni.navigateBack() diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index db4fcc0..9a55df6 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -3,7 +3,7 @@ Component({ selected: 0, "color": "#FFEEE1", "selectedColor": "#FFFFFF", - "backgroundColor": "#60CA2C", + "backgroundColor": "#F69448", list: [ // { // "pagePath": "/pages/home/cloudCard", diff --git a/manifest.json b/manifest.json index c5bd04f..28ce27a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,28 +1,28 @@ { - "name" : "yxt-yyth", - "appid" : "__UNI__1500881", - "description" : "", - "versionName" : "1.0.1", - "versionCode" : 101, - "transformPx" : false, + "name": "yxt-yyth", + "appid": "__UNI__1500881", + "description": "", + "versionName": "1.0.1", + "versionCode": 101, + "transformPx": false, /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 }, /* 模块配置 */ - "modules" : {}, + "modules": {}, /* 应用发布信息 */ - "distribute" : { + "distribute": { /* android打包配置 */ - "android" : { - "permissions" : [ + "android": { + "permissions": [ "", "", "", @@ -41,35 +41,35 @@ ] }, /* ios打包配置 */ - "ios" : {}, + "ios": {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs": {} } }, /* 快应用特有相关 */ - "quickapp" : {}, + "quickapp": {}, /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wx4724e3a3c27f36b5", - "setting" : { - "urlCheck" : false, - "postcss" : true, - "minified" : true + "mp-weixin": { + "appid": "wxc1a7e6792a779a52", + "setting": { + "urlCheck": false, + "postcss": true, + "minified": true }, - "usingComponents" : true, - "lazyCodeLoading" : "requiredComponents" + "usingComponents": true, + "lazyCodeLoading": "requiredComponents" }, - "mp-alipay" : { - "usingComponents" : true + "mp-alipay": { + "usingComponents": true }, - "mp-baidu" : { - "usingComponents" : true + "mp-baidu": { + "usingComponents": true }, - "mp-toutiao" : { - "usingComponents" : true + "mp-toutiao": { + "usingComponents": true }, - "uniStatistics" : { - "enable" : false + "uniStatistics": { + "enable": false }, - "vueVersion" : "2" -} + "vueVersion": "2" +} \ No newline at end of file diff --git a/pages.json b/pages.json index dd1aea3..a1c3289 100644 --- a/pages.json +++ b/pages.json @@ -435,15 +435,15 @@ "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "惠享云菜窖", - "navigationBarBackgroundColor": "#60CA2C", - "backgroundColor": "#60CA2C" + "navigationBarBackgroundColor": "#FE9039", + "backgroundColor": "#FE9039" }, "tabBar": { "custom": true, //自定义tabBar "color": "#FFEEE1", "selectedColor": "#191919", "borderStyle": "white", - "backgroundColor": "#60CA2C", + "backgroundColor": "#F69448", "list": [ // { // "pagePath": "pages/home/cloudCard", diff --git a/pages/SelectAddressActivity.vue b/pages/SelectAddressActivity.vue index e19648f..2f249e9 100644 --- a/pages/SelectAddressActivity.vue +++ b/pages/SelectAddressActivity.vue @@ -1,6 +1,6 @@