zhangshengli
/
yshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
孟权伟 4 months ago
parent 902d6f1632 196e51f25d
commit 40ae1cb576
17 changed files with 737 additions and 381 deletions
Show Stats Download Patch File Download Diff File

7
fuintAdmin/.env.development
Unescape Escape View File

@ -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/'

4
fuintAdmin/.env.production
Unescape Escape View File

@ -1,10 +1,10 @@
# 页面标题
VUE_APP_TITLE = 会员演示营销管理系统
VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店
# 生产环境配置
ENV = 'production'
# 会员演示营销系统/生产环境
# 李学武牡丹瓷官方旗舰店/生产环境
VUE_APP_BASE_API = '/dev-api'
# 发布目录

4
fuintAdmin/.env.staging
Unescape Escape View File

@ -1,10 +1,10 @@
# 页面标题
VUE_APP_TITLE = 会员演示营销管理系统
VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店
# 测试环境配置
ENV = 'staging'
# 会员演示营销系统/测试环境
# 李学武牡丹瓷官方旗舰店/测试环境
VUE_APP_BASE_API = '/stage-api'
# 发布目录

2
fuintAdmin/package.json
Unescape Escape View File

@ -1,7 +1,7 @@
{
"name": "fuintAdmin",
"version": "3.0.3",
"description": "会员演示营销系统后台管理端",
"description": "李学武牡丹瓷官方旗舰店",
"author": "FSQ",
"license": "MIT",
"scripts": {

4
fuintAdmin/src/views/login.vue
Unescape Escape View File

@ -65,7 +65,9 @@
</el-form-item>
</el-form>
<div class="copy-right">
<span>Copyright © 2022-2024 <a class="link" href="https://www.baidu.com">演示</a> All Rights Reserved.</span>
<span>华码科技 © 2022-2024
<!-- <a class="link" href="https://www.baidu.com">演示</a>-->
All Rights Reserved.</span>
</div>
</div>
</div>

2
fuintAdmin/vue.config.js
Unescape Escape View File

@ -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 // 端口

11
fuintUniapp/api/indexDeil.js
Unescape Escape View File

@ -0,0 +1,11 @@
import request from '@/utils/request'
// api地址
const api = {
list: 'clientApi/store/detail',
}
// 帮助中心列表
export const listDetil = (param) => {
return request.get(api.list, param)
}

3
fuintUniapp/config.js
Unescape Escape View File

@ -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',
}

7
fuintUniapp/node_modules/.package-lock.json generated vendored
Unescape Escape View File

@ -0,0 +1,7 @@
{
"name": "身份证/数字键盘/密码键盘/支付键盘",
"version": "1.0.3",
"lockfileVersion": 2,
"requires": true,
"packages": {}
}

12
fuintUniapp/package-lock.json generated
Unescape Escape View File

@ -0,0 +1,12 @@
{
"name": "身份证/数字键盘/密码键盘/支付键盘",
"version": "1.0.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "身份证/数字键盘/密码键盘/支付键盘",
"version": "1.0.3"
}
}
}

26
fuintUniapp/pages.json
Unescape Escape View File

@ -4,23 +4,27 @@
"selectedColor": "#ff0000",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"fontSize":"30rpx",
"list": [{
"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": [
{
@ -342,6 +346,18 @@
"style": {
"navigationBarTitleText": "卡券兑换"
}
},
{
"path": "pages/companyInformation/companyInformation",
"style": {
"navigationBarTitleText": "公司信息"
}
},
{
"path": "pages/companyDetil/companyDetil",
"style": {
"navigationBarTitleText": "公司详情"
}
}
],
"globalStyle": {

80
fuintUniapp/pages/companyDetil/companyDetil.vue
Unescape Escape View File

@ -0,0 +1,80 @@
<template>
<view class="company-info-container">
<img style="width: 100%;height: 400rpx;" :src="'http://192.168.10.110:8999' + list.logo" />
<view class="section">
<view class="label">公司简介</view>
<view class="content">
{{ list.name }}
</view>
</view>
<view class="divider"></view>
<view class="section">
<view class="label">公司地址</view>
<view class="content">{{ list.address }}</view>
</view>
<view class="section">
<view class="label">联系电话</view>
<view class="content">{{ list.phone }}</view>
</view>
</view>
</template>
<script>
import * as Api from '@/api/indexDeil'
import Empty from '@/components/empty'
export default {
components: {
Empty
},
data() {
return {
mtDetails: '',
list: {},
}
},
onLoad(options) {
Api.listDetil({ id: options.storeId })
.then(result => {
console.log(result);
this.mtDetails = result.data.storeInfo.mtDetails
this.list = result.data.storeInfo
})
}
}
</script>
<style scoped>
.company-info-container {
display: flex;
flex-direction: column;
}
.section {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20rpx;
}
.label {
font-size: 32rpx;
font-weight: bold;
color: #333;
min-width: 180rpx;
text-align: center;
border-right: 2rpx solid #ccc;
}
.content {
margin-left: 20rpx;
flex: 1;
font-size: 14px;
color: #666;
}
.divider {
height: 2rpx;
background-color: #ccc;
margin: 30rpx 0;
}
</style>

222
fuintUniapp/pages/companyInformation/companyInformation.vue
Unescape Escape View File

@ -0,0 +1,222 @@
<template>
<view class="container">
<view class="search-wrapper">
<view class="search-input">
<view class="search-input-wrapper">
<view class="left">
<text class="search-icon iconfont icon-sousuo"></text>
</view>
<view class="right">
<input v-model="searchValue" class="input" placeholder="请输入店铺关键字" type="text"></input>
</view>
</view>
</view>
<view class="search-button">
<button class="button" @click="doSearch" type="warn"> 搜索 </button>
</view>
</view>
<view class="store-list">
<view class="store-info" v-for="(item, index) in storeList" :key="index" @click="handleQuick(item.id)">
<view class="base-info">
<view class="name">{{ item.name }}</view>
<view class="hours">营业时间：{{ item.hours }}</view>
<view class="address"><text class="location-icon iconfont icon-dingwei"></text>{{ item.address }}</view>
<view class="tel">联系电话：{{ item.phone }}</view>
</view>
<view class="loc-info">
<text class="dis"><text class="distance">{{ parseFloat(item.distance).toFixed(1) }}</text>公里</text>
</view>
</view>
</view>
<empty v-if="!storeList.length" :isLoading="isLoading" :custom-style="{ padding: '180rpx 50rpx' }" tips="暂无店铺~">
</empty>
</view>
</template>
<script>
import * as settingApi from '@/api/setting'
import * as userApi from '@/api/user'
import Empty from '@/components/empty'
export default {
components: {
Empty
},
data() {
return {
storeId: 0,
searchValue: '',
storeList: []
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
this.storeId = this.getStoreId()
this.getStoreList()
},
methods: {
/**
* 获取店铺列表
* */
getStoreList() {
const app = this
settingApi.storeList(app.searchValue)
.then(result => {
app.storeList = result.data.data
})
},
/**
* 获取历史店铺
*/
getStoreId() {
return uni.getStorageSync("storeId")
},
/**
* 搜索提交
*/
doSearch() {
this.getStoreList()
},
/**
* 跳转回去
*/
handleQuick(storeId) {
this.$navTo(`pages/companyDetil/companyDetil`, { storeId })
// const app = this
// userApi.defaultStore(storeId)
// .then(result => {
// uni.setStorageSync("storeId", storeId);
// // 刷新相关页面数据
// uni.setStorageSync("reflashHomeData", true);
// uni.navigateBack();
// })
}
}
}
</script>
<style lang="scss" scoped>
.container {
padding: 20rpx;
min-height: 100vh;
background: #f7f7f7;
}
.search-wrapper {
display: flex;
height: 78rpx;
}
// 搜索输入框
.search-input {
width: 80%;
background: #fff;
border-radius: 50rpx 0 0 50rpx;
box-sizing: border-box;
overflow: hidden;
border: solid 1px #cccccc;
.search-input-wrapper {
display: flex;
.left {
display: flex;
width: 60rpx;
justify-content: center;
align-items: center;
.search-icon {
display: block;
color: #666666;
font-size: 30rpx;
font-weight: bold;
}
}
.right {
flex: 1;
input {
font-size: 28rpx;
height: 78rpx;
line-height: 78rpx;
.input-placeholder {
color: #aba9a9;
}
}
}
}
}
// 搜索按钮
.search-button {
width: 20%;
box-sizing: border-box;
.button {
line-height: 78rpx;
height: 78rpx;
font-size: 28rpx;
border-radius: 0 20px 20px 0;
background: $fuint-theme;
}
}
// 店铺列表
.store-list {
.store-info {
padding: 10px 0;
overflow: hidden;
border: 2rpx solid #cccccc;
min-height: 240rpx;
border-radius: 5rpx;
margin-top: 10rpx;
margin-bottom: 10rpx;
padding: 30rpx;
background: #FFFFFF;
.base-info {
float: left;
width: 70%;
.name {
font-size: 34rpx;
font-weight: bold;
margin-top: 15rpx;
margin-bottom: 12rpx;
color: #666;
}
.location-icon {
color: #f03c3c;
font-weight: bold;
}
}
.loc-info {
color: #666666;
// dispaly:flex;
line-height: 240rpx;
float: left;
overflow: hidden;
width: 30%;
text-align: right;
.distance {
font-weight: bold;
color: #f03c3c;
}
}
}
}
</style>

4
fuintUniapp/pages/goods/detail.vue
Unescape Escape View File

@ -104,9 +104,9 @@
</view>
<view class="tel">联系电话：{{ storeList.phone }}</view>
</view>
<view class="loc-info">
<!-- <view class="loc-info">
<text class="dis"><text class="distance">{{ parseFloat(storeList.distance).toFixed(1) }}</text>公里</text>
</view>
</view> -->
</view>
</u-modal>

22
fuintUniapp/pages/index/index.vue
Unescape Escape View File

@ -15,15 +15,15 @@
</block>
<block>
<!-- <block>
咨讯
<!-- <News v-if="storeInfo" :itemStyle="options.newsStyle" :params="options.newsParam" :dataList="news"/> -->
</block>
<News v-if="storeInfo" :itemStyle="options.newsStyle" :params="options.newsParam" :dataList="news"/>
</block> -->
<!-- <block>
<block>
<NavBar v-if="storeInfo" :itemStyle="options.navStyle" :params="{}" :dataList="options.navBar"/>
</block> -->
</block>
<block>
<Blank v-if="storeInfo" :itemStyle="options.blankStyle"/>
</block>
@ -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",

BIN
fuintUniapp/static/nav/gsxx.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

Write Preview
Loading…
Cancel
Save