diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development index 82849da..b3e75d6 100644 --- a/fuintAdmin/.env.development +++ b/fuintAdmin/.env.development @@ -1,14 +1,15 @@ # 页面标题 -VUE_APP_TITLE = 会员演示营销管理系统 +VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店 # 开发环境配置 ENV = 'development' -# 会员演示营销系统/开发环境 +# 李学武牡丹瓷官方旗舰店/开发环境 VUE_APP_BASE_API = '/dev-api' # 发布目录 VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 -VUE_APP_SERVER_URL = 'http://127.0.0.1:8999/' +#VUE_APP_SERVER_URL = 'http://127.0.0.1:8999/' +VUE_APP_SERVER_URL = 'http://192.168.10.70:8999/' diff --git a/fuintAdmin/.env.production b/fuintAdmin/.env.production index 59433cb..a27ec9d 100644 --- a/fuintAdmin/.env.production +++ b/fuintAdmin/.env.production @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 会员演示营销管理系统 +VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店 # 生产环境配置 ENV = 'production' -# 会员演示营销系统/生产环境 +# 李学武牡丹瓷官方旗舰店/生产环境 VUE_APP_BASE_API = '/dev-api' # 发布目录 diff --git a/fuintAdmin/.env.staging b/fuintAdmin/.env.staging index 0818993..7fb6ded 100644 --- a/fuintAdmin/.env.staging +++ b/fuintAdmin/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 会员演示营销管理系统 +VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店 # 测试环境配置 ENV = 'staging' -# 会员演示营销系统/测试环境 +# 李学武牡丹瓷官方旗舰店/测试环境 VUE_APP_BASE_API = '/stage-api' # 发布目录 diff --git a/fuintAdmin/package.json b/fuintAdmin/package.json index d4801e2..0664d54 100644 --- a/fuintAdmin/package.json +++ b/fuintAdmin/package.json @@ -1,7 +1,7 @@ { "name": "fuintAdmin", "version": "3.0.3", - "description": "会员演示营销系统后台管理端", + "description": "李学武牡丹瓷官方旗舰店", "author": "FSQ", "license": "MIT", "scripts": { diff --git a/fuintAdmin/src/views/login.vue b/fuintAdmin/src/views/login.vue index 6de03cf..e3efb5f 100644 --- a/fuintAdmin/src/views/login.vue +++ b/fuintAdmin/src/views/login.vue @@ -65,7 +65,9 @@
- Copyright © 2022-2024 演示 All Rights Reserved. + 华码科技 © 2022-2024 + + All Rights Reserved.
diff --git a/fuintAdmin/vue.config.js b/fuintAdmin/vue.config.js index 23c870b..e547703 100644 --- a/fuintAdmin/vue.config.js +++ b/fuintAdmin/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '会员演示营销管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '李学武牡丹瓷官方旗舰店' // 网页标题 const port = process.env.port || process.env.npm_config_port || 81 // 端口 diff --git a/fuintUniapp/config.js b/fuintUniapp/config.js index 60a029e..9696886 100644 --- a/fuintUniapp/config.js +++ b/fuintUniapp/config.js @@ -3,7 +3,8 @@ module.exports = { name: '会员系统', // 必填: 后端api地址, 斜杠/结尾 // apiUrl: 'http://192.168.1.103:8999/', - apiUrl: 'http://192.168.10.31:8999/',//服务器 + // apiUrl: 'http://192.168.10.31:8999/',//服务器 + apiUrl: 'http://192.168.10.70:8999/', // 必填: 默认商户号，从后台商户列表获取 merchantNo: '10001', } diff --git a/fuintUniapp/package.json b/fuintUniapp/package.json index 9b59f52..24a969c 100644 --- a/fuintUniapp/package.json +++ b/fuintUniapp/package.json @@ -6,4 +6,4 @@ "keywords": [ "数字键盘、密码键盘、支付键盘" ] -} \ No newline at end of file +} diff --git a/fuintUniapp/pages.json b/fuintUniapp/pages.json index 24f2708..14c045c 100644 --- a/fuintUniapp/pages.json +++ b/fuintUniapp/pages.json @@ -1,359 +1,375 @@ { - "tabBar": { - "color": "#000000", - "selectedColor": "#ff0000", - "borderStyle": "black", - "backgroundColor": "#ffffff", - "fontSize":"30rpx", - "list": [{ - "pagePath": "pages/index/index", - "iconPath": "static/tabbar/home.png", - "selectedIconPath": "static/tabbar/home-active.png", - "text": "首页" - }, { - "pagePath": "pages/category/index", - "iconPath": "static/tabbar/shop.png", - "selectedIconPath": "static/tabbar/shop-active.png", - "text": "微店" - },{ - "pagePath": "pages/user/index", - "iconPath": "static/tabbar/user.png", - "selectedIconPath": "static/tabbar/user-active.png", - "text": "我的" - }] - }, - "pages": [ - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "首页", - "navigationBarBackgroundColor": "#00acac", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/category/index", - "style": { - "navigationBarTitleText": "微店", - "navigationBarBackgroundColor": "#00acac", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/cart/index", - "style": { - "navigationBarTitleText": "购物车" - } - }, - { - "path": "pages/user/index", - "style": { - "navigationBarTitleText": "会员中心", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/user/setting", - "style": { - "navigationBarTitleText": "个人信息" - } - }, - { - "path": "pages/user/code", - "style": { - "navigationBarTitleText": "我的会员码" - } - }, - { - "path": "pages/user/card", - "style": { - "navigationBarTitleText": "领取会员卡" - } - }, - { - "path": "pages/user/password", - "style": { - "navigationBarTitleText": "我的密码" - } - }, - { - "path": "pages/custom/index", - "style": { - "enablePullDownRefresh": true - } - }, - { - "path": "pages/search/index", - "style": { - "navigationBarTitleText": "商品搜索" - } - }, - { - "path": "pages/location/index", - "style": { - "navigationBarTitleText": "切换店铺" - } - }, - { - "path": "pages/login/index", - "style": { - "navigationBarTitleText": "会员登录" - } - }, - { - "path": "pages/login/auth", - "style": { - "navigationBarTitleText": "授权登录" - } - }, - { - "path": "pages/help/index", - "style": { - "navigationBarTitleText": "帮助中心" - } - }, - { - "path": "pages/coupon/list", - "style": { - "navigationBarTitleText": "领券中心" - } - }, - { - "path": "pages/coupon/detail", - "style": { - "navigationBarTitleText": "优惠券详情" - } - }, - { - "path": "pages/timer/detail", - "style": { - "navigationBarTitleText": "计次卡详情", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/prestore/buy", - "style": { - "navigationBarTitleText": "购买储值卡", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/prestore/detail", - "style": { - "navigationBarTitleText": "储值卡详情", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/confirm/doConfirm", - "style": { - "navigationBarTitleText": "核销确认" - } - }, - { - "path": "pages/confirm/result", - "style": { - "navigationBarTitleText": "核销结果" - } - }, - { - "path": "pages/goods/list", - "style": { - "navigationBarTitleText": "商品列表", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/goods/detail", - "style": { - "navigationBarTitleText": "商品详情" - } - }, - { - "path": "pages/my-coupon/index", - "style": { - "navigationBarTitleText": "我的卡券", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/address/index", - "style": { - "navigationBarTitleText": "收货地址" - } - }, - { - "path": "pages/address/create", - "style": { - "navigationBarTitleText": "新增收货地址" - } - }, - { - "path": "pages/address/update", - "style": { - "navigationBarTitleText": "编辑收货地址" - } - }, - { - "path": "pages/points/detail", - "style": { - "navigationBarTitleText": "积分明细" - } - }, - { - "path": "pages/points/gift", - "style": { - "navigationBarTitleText": "积分转赠" - } - }, - { - "path": "pages/give/index", - "style": { - "navigationBarTitleText": "转赠记录" - } - }, - { - "path": "pages/wallet/index", - "style": { - "navigationBarTitleText": "我的余额" - } - }, - { - "path": "pages/wallet/recharge/index", - "style": { - "navigationBarTitleText": "我要充值" - } - }, - { - "path": "pages/wallet/recharge/order", - "style": { - "navigationBarTitleText": "充值记录" - } - }, - { - "path": "pages/wallet/balance/log", - "style": { - "navigationBarTitleText": "账单详情" - } - }, - { - "path": "pages/settlement/index", - "style": { - "navigationBarTitleText": "结算中心" - } - }, - { - "path": "pages/settlement/goods", - "style": { - "navigationBarTitleText": "订单确认" - } - }, - { - "path": "pages/order/index", - "style": { - "navigationBarTitleText": "我的订单", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/order/detail", - "style": { - "navigationBarTitleText": "订单详情", - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#00acac" - } - }, - { - "path": "pages/order/result", - "style": { - "navigationBarTitleText": "支付结果" - } - }, - { - "path": "pages/refund/index", - "style": { - "navigationBarTitleText": "退换/售后" - } - }, - { - "path": "pages/refund/detail", - "style": { - "navigationBarTitleText": "售后详情" - } - }, - { - "path": "pages/refund/apply", - "style": { - "navigationBarTitleText": "申请售后" - } - }, - { - "path": "pages/pay/index", - "style": { - "navigationBarTitleText": "向商家付款" - } - }, - { - "path": "pages/pay/result", - "style": { - "navigationBarTitleText": "支付结果" - } - }, - { - "path": "pages/merchant/index", - "style": { - "navigationBarTitleText": "商家管理" - } - }, - { - "path": "pages/pay/cashier", - "style": { - "navigationBarTitleText": "扫码收款" - } - }, - { - "path": "pages/merchant/member/index", - "style": { - "navigationBarTitleText": "会员列表" - } - }, - { - "path": "pages/merchant/order/index", - "style": { - "navigationBarTitleText": "订单列表" - } - }, - { - "path": "pages/article/index", - "style": { - "navigationBarTitleText": "文章列表" - } - }, - { - "path": "pages/article/detail", - "style": { - "navigationBarTitleText": "文章详情" - } - }, - { - "path": "pages/coupon/receive", - "style": { - "navigationBarTitleText": "卡券兑换" - } - } - ], - "globalStyle": { - "navigationBarBackgroundColor": "#ffffff", - "navigationBarTitleText": "", - "navigationBarTextStyle": "black", - "backgroundTextStyle": "dark" - }, - "easycom": { - "autoscan": true, - "custom": { - "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" - } - } -} + "tabBar": { + "color": "#000000", + "selectedColor": "#ff0000", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "fontSize": "30rpx", + "list": [ + { + "pagePath": "pages/index/index", + "iconPath": "static/tabbar/home.png", + "selectedIconPath": "static/tabbar/home-active.png", + "text": "首页" + }, + { + "pagePath": "pages/category/index", + "iconPath": "static/tabbar/shop.png", + "selectedIconPath": "static/tabbar/shop-active.png", + "text": "微店" + }, + { + "pagePath": "pages/user/index", + "iconPath": "static/tabbar/user.png", + "selectedIconPath": "static/tabbar/user-active.png", + "text": "我的" + } + ] + }, + "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "首页", + "navigationBarBackgroundColor": "#00acac", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/category/index", + "style": { + "navigationBarTitleText": "微店", + "navigationBarBackgroundColor": "#00acac", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/cart/index", + "style": { + "navigationBarTitleText": "购物车" + } + }, + { + "path": "pages/user/index", + "style": { + "navigationBarTitleText": "会员中心", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/user/setting", + "style": { + "navigationBarTitleText": "个人信息" + } + }, + { + "path": "pages/user/code", + "style": { + "navigationBarTitleText": "我的会员码" + } + }, + { + "path": "pages/user/card", + "style": { + "navigationBarTitleText": "领取会员卡" + } + }, + { + "path": "pages/user/password", + "style": { + "navigationBarTitleText": "我的密码" + } + }, + { + "path": "pages/custom/index", + "style": { + "enablePullDownRefresh": true + } + }, + { + "path": "pages/search/index", + "style": { + "navigationBarTitleText": "商品搜索" + } + }, + { + "path": "pages/location/index", + "style": { + "navigationBarTitleText": "切换店铺" + } + }, + { + "path": "pages/login/index", + "style": { + "navigationBarTitleText": "会员登录" + } + }, + { + "path": "pages/login/auth", + "style": { + "navigationBarTitleText": "授权登录" + } + }, + { + "path": "pages/help/index", + "style": { + "navigationBarTitleText": "帮助中心" + } + }, + { + "path": "pages/coupon/list", + "style": { + "navigationBarTitleText": "领券中心" + } + }, + { + "path": "pages/coupon/detail", + "style": { + "navigationBarTitleText": "优惠券详情" + } + }, + { + "path": "pages/timer/detail", + "style": { + "navigationBarTitleText": "计次卡详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/prestore/buy", + "style": { + "navigationBarTitleText": "购买储值卡", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/prestore/detail", + "style": { + "navigationBarTitleText": "储值卡详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/confirm/doConfirm", + "style": { + "navigationBarTitleText": "核销确认" + } + }, + { + "path": "pages/confirm/result", + "style": { + "navigationBarTitleText": "核销结果" + } + }, + { + "path": "pages/goods/list", + "style": { + "navigationBarTitleText": "商品列表", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/goods/detail", + "style": { + "navigationBarTitleText": "商品详情" + } + }, + { + "path": "pages/my-coupon/index", + "style": { + "navigationBarTitleText": "我的卡券", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/address/index", + "style": { + "navigationBarTitleText": "收货地址" + } + }, + { + "path": "pages/address/create", + "style": { + "navigationBarTitleText": "新增收货地址" + } + }, + { + "path": "pages/address/update", + "style": { + "navigationBarTitleText": "编辑收货地址" + } + }, + { + "path": "pages/points/detail", + "style": { + "navigationBarTitleText": "积分明细" + } + }, + { + "path": "pages/points/gift", + "style": { + "navigationBarTitleText": "积分转赠" + } + }, + { + "path": "pages/give/index", + "style": { + "navigationBarTitleText": "转赠记录" + } + }, + { + "path": "pages/wallet/index", + "style": { + "navigationBarTitleText": "我的余额" + } + }, + { + "path": "pages/wallet/recharge/index", + "style": { + "navigationBarTitleText": "我要充值" + } + }, + { + "path": "pages/wallet/recharge/order", + "style": { + "navigationBarTitleText": "充值记录" + } + }, + { + "path": "pages/wallet/balance/log", + "style": { + "navigationBarTitleText": "账单详情" + } + }, + { + "path": "pages/settlement/index", + "style": { + "navigationBarTitleText": "结算中心" + } + }, + { + "path": "pages/settlement/goods", + "style": { + "navigationBarTitleText": "订单确认" + } + }, + { + "path": "pages/order/index", + "style": { + "navigationBarTitleText": "我的订单", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/order/detail", + "style": { + "navigationBarTitleText": "订单详情", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#00acac" + } + }, + { + "path": "pages/order/result", + "style": { + "navigationBarTitleText": "支付结果" + } + }, + { + "path": "pages/refund/index", + "style": { + "navigationBarTitleText": "退换/售后" + } + }, + { + "path": "pages/refund/detail", + "style": { + "navigationBarTitleText": "售后详情" + } + }, + { + "path": "pages/refund/apply", + "style": { + "navigationBarTitleText": "申请售后" + } + }, + { + "path": "pages/pay/index", + "style": { + "navigationBarTitleText": "向商家付款" + } + }, + { + "path": "pages/pay/result", + "style": { + "navigationBarTitleText": "支付结果" + } + }, + { + "path": "pages/merchant/index", + "style": { + "navigationBarTitleText": "商家管理" + } + }, + { + "path": "pages/pay/cashier", + "style": { + "navigationBarTitleText": "扫码收款" + } + }, + { + "path": "pages/merchant/member/index", + "style": { + "navigationBarTitleText": "会员列表" + } + }, + { + "path": "pages/merchant/order/index", + "style": { + "navigationBarTitleText": "订单列表" + } + }, + { + "path": "pages/article/index", + "style": { + "navigationBarTitleText": "文章列表" + } + }, + { + "path": "pages/article/detail", + "style": { + "navigationBarTitleText": "文章详情" + } + }, + { + "path": "pages/coupon/receive", + "style": { + "navigationBarTitleText": "卡券兑换" + } + }, + { + "path": "pages/companyInformation/companyInformation", + "style": { + "navigationBarTitleText": "公司信息" + } + }, + { + "path": "pages/companyDetil/companyDetil", + "style": { + "navigationBarTitleText": "公司详情" + } + } + ], + "globalStyle": { + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTitleText": "", + "navigationBarTextStyle": "black", + "backgroundTextStyle": "dark" + }, + "easycom": { + "autoscan": true, + "custom": { + "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" + } + } +} \ No newline at end of file diff --git a/fuintUniapp/pages/goods/detail.vue b/fuintUniapp/pages/goods/detail.vue index c01abe4..d209432 100644 --- a/fuintUniapp/pages/goods/detail.vue +++ b/fuintUniapp/pages/goods/detail.vue @@ -104,9 +104,9 @@ 联系电话：{{ storeList.phone }} - + diff --git a/fuintUniapp/pages/index/index.vue b/fuintUniapp/pages/index/index.vue index cf3615a..f2f1edd 100644 --- a/fuintUniapp/pages/index/index.vue +++ b/fuintUniapp/pages/index/index.vue @@ -15,15 +15,15 @@ - + - + + --> - + @@ -67,11 +67,15 @@ "background": "#ffffff", }, "navBar": [{ - "imgUrl": "/static/nav/1.png", + // "imgUrl": "/static/nav/1.png", + "imgUrl": "/static/nav/gsxx.png", "imgName": "icon-1.png", - "linkUrl": "pages\/pay\/index", - "text": "买单支付", - "tip": "支付攒积分", + // "linkUrl": "pages\/pay\/index", + // "text": "买单支付", + "linkUrl": "pages\/companyInformation\/companyInformation", + "text": "公司信息", + // "tip": "支付攒积分", + "tip": "公司信息", "color": "#666666" }, { "imgUrl": "/static/nav/3.png",