Loki/fish-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

👍

Browse Source
This commit is contained in:
Boom
2023-11-18 13:46:52 +08:00
parent 3e08136bfa
commit 7f4aecb936
13 changed files with 519 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -15,7 +15,7 @@
## 注意事项 ## 注意事项
- uniapp v3.1 版本已经兼容 h5，另外 yshop 有自己的 H5，uniappv3.1 以下版本未对 H5 端进行处理，如果需要请自行兼容。 - uniapp v3.1 版本已经兼容 h5，另外 有自己的 H5，uniappv3.1 以下版本未对 H5 端进行处理，如果需要请自行兼容。
- manifest.json 中可以配置 uni 项目的一些信息 - manifest.json 中可以配置 uni 项目的一些信息
- 打开 manifest.json 可配置小程序的 appid - 打开 manifest.json 可配置小程序的 appid
- 由于需要兼容 app，公共样式由 main.js 迁移到了 App.vue，公共样式请在 App.vue 中进行编辑 - 由于需要兼容 app，公共样式由 main.js 迁移到了 App.vue，公共样式请在 App.vue 中进行编辑
@@ -24,7 +24,7 @@
## git issuse 地址 ## git issuse 地址
https://gitee.com/guchengwuyue/yshopmall https://gitee.com/guchengwuyue/mall
### 请按照以下模板提交 issuse ### 请按照以下模板提交 issuse
components/ShopLiveCard.vue
+2 -2
View File
@@ -1,4 +1,4 @@
<template> <!-- <template>
<view class="sp-live-card" :style="{ width: wh + 'rpx' }"> <view class="sp-live-card" :style="{ width: wh + 'rpx' }">
<view class="live-content" @tap="goRoom" :style="{ width: wh + 'rpx' }"> <view class="live-content" @tap="goRoom" :style="{ width: wh + 'rpx' }">
<image class="item-cover" :src="detail.shareImge" mode="aspectFill"></image> <image class="item-cover" :src="detail.shareImge" mode="aspectFill"></image>
@@ -321,4 +321,4 @@
} }
} }
} }
</style> </style> -->
components/UserEvaluation.vue
+1 -1
View File
@@ -19,7 +19,7 @@
</view> </view>
</view> </view>
<view class="reply" v-if="item.merchantReplyContent"> <view class="reply" v-if="item.merchantReplyContent">
<span class="font-color-red">yshop店员</span> <span class="font-color-red">店员</span>
：{{item.merchantReplyContent}} ：{{item.merchantReplyContent}}
</view> </view>
</view> </view>
config/index.js
+1 -1
View File
@@ -1,7 +1,7 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
// export const VUE_APP_API_URL = '/h5api' // export const VUE_APP_API_URL = '/h5api'
export const VUE_APP_API_URL = 'http://127.0.0.1:8008/api' export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api' // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
manifest.json
+10 -11
View File
@@ -1,6 +1,6 @@
{ {
"name" : "yshopmall", "name" : "ZSW",
"appid" : "__UNI__CF66760", "appid" : "__UNI__7085CB1",
"description" : "", "description" : "",
"versionName" : "1.0.2", "versionName" : "1.0.2",
"versionCode" : 2, "versionCode" : 2,
@@ -243,7 +243,7 @@
}, },
"quickapp" : {}, "quickapp" : {},
"mp-weixin" : { "mp-weixin" : {
"appid" : "wx604d2ea4702620d2", "appid" : "wx2914c96abb4b0be9",
"setting" : { "setting" : {
"urlCheck" : false "urlCheck" : false
}, },
@@ -254,14 +254,13 @@
} }
}, },
// "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ], // "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
"plugins" : { "plugins" : {}
// #ifdef MP-WEIXIN
"live-player-plugin" : {
"version" : "1.2.8",
"provider" : "wx2b03c6e691cd7370"
}
}
}, },
// #ifdef MP-WEIXIN
// "live-player-plugin" : {
// "version" : "1.2.8",
// "provider" : "wx2b03c6e691cd7370"
// }
// #endif // #endif
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true
@@ -273,7 +272,7 @@
"usingComponents" : true "usingComponents" : true
}, },
"h5" : { "h5" : {
"title" : "yshop", "title" : "mall",
"devServer" : { "devServer" : {
"disableHostCheck" : true, "disableHostCheck" : true,
"proxy" : { "proxy" : {
package.json
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "yshopmall_uni", "name": "mall_uni",
"version": "3.3.0", "version": "3.3.0",
"description": "", "description": "",
"main": "main.js", "main": "main.js",
pages.json
+11 -13
View File
@@ -3,7 +3,7 @@
{ {
"path": "pages/Loading/index", "path": "pages/Loading/index",
"style": { "style": {
"navigationBarTitleText": "yshop商城" "navigationBarTitleText": "系统"
} }
}, },
{ {
@@ -40,7 +40,7 @@
{ {
"path": "pages/home/index", "path": "pages/home/index",
"style": { "style": {
"navigationBarTitleText": "yshop商城", "navigationBarTitleText": "系统",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
@@ -429,16 +429,15 @@
"navigationBarTitleText": "地图" "navigationBarTitleText": "地图"
} }
}, },
// {
// "path": "pages/shop/Live/LiveList/index",
// "style": {
// "navigationBarTitleText": "直播列表"
// }
// },
{ {
"path": "pages/shop/Live/LiveList/index",
"style": {
"navigationBarTitleText": "直播列表"
}
}
,{
"path": "pages/user/content/content", "path": "pages/user/content/content",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
@@ -453,7 +452,7 @@
}, },
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "Yshop", "navigationBarTitleText": "ZSW",
"navigationBarBackgroundColor": "#F8F8F8", "navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8",
"navigationStyle": "default" "navigationStyle": "default"
@@ -467,8 +466,7 @@
"fontSize": "10px", "fontSize": "10px",
"iconWidth": "24px", "iconWidth": "24px",
"spacing": "3px", "spacing": "3px",
"list": [ "list": [{
{
"pagePath": "pages/home/index", "pagePath": "pages/home/index",
"iconPath": "static/icon-home.png", "iconPath": "static/icon-home.png",
"selectedIconPath": "static/icon-home-hot.png", "selectedIconPath": "static/icon-home-hot.png",
pages/authorization/index.vue
+1 -1
View File
@@ -7,7 +7,7 @@
> >
<view class="force-login__content y-f"> <view class="force-login__content y-f">
<image src="@/static/120x120.png" style="width: 100rpx; height: 100rpx;border-radius: 100rpx;"></image> <image src="@/static/120x120.png" style="width: 100rpx; height: 100rpx;border-radius: 100rpx;"></image>
<view class="login-notice">YSHOP电商系统</view> <view class="login-notice">电商系统</view>
<button <button
class="cu-btn author-btn" class="cu-btn author-btn"
open-type="getPhoneNumber" open-type="getPhoneNumber"
pages/home/components/Live.vue
+2 -2
View File
@@ -1,4 +1,4 @@
<template> <!-- <template>
<view class="live-el mx20 mb10"> <view class="live-el mx20 mb10">
<view class="head"> <view class="head">
<text class="head-title">热门直播</text> <text class="head-title">热门直播</text>
@@ -243,4 +243,4 @@
} }
} }
} }
</style> </style> -->
pages/home/index.vue
+3 -3
View File
@@ -54,7 +54,7 @@
:detail="benefit" /> :detail="benefit" />
<!-- 直播 --> <!-- 直播 -->
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<Live v-if="item.type == 'live'" :detail="live" /> <!-- <Live v-if="item.type == 'live'" :detail="live" /> -->
<!-- #endif --> <!-- #endif -->
<!-- 为您推荐 --> <!-- 为您推荐 -->
<PromotionGood v-if="item.type == 'promotionGood'" :benefit="benefit" /> <PromotionGood v-if="item.type == 'promotionGood'" :benefit="benefit" />
@@ -82,7 +82,7 @@ import Banner from './components/Banner'
import HotCommodity from './components/HotCommodity' import HotCommodity from './components/HotCommodity'
import FirstNewProduct from './components/FirstNewProduct' import FirstNewProduct from './components/FirstNewProduct'
import ProductsRecommended from './components/ProductsRecommended' import ProductsRecommended from './components/ProductsRecommended'
import Live from './components/Live' // import Live from './components/Live'
import { getHomeData, getShare, getCanvas } from '@/api/public' import { getHomeData, getShare, getCanvas } from '@/api/public'
import cookie from '@/utils/store/cookie' import cookie from '@/utils/store/cookie'
@@ -108,7 +108,7 @@ export default {
HotCommodity, HotCommodity,
FirstNewProduct, FirstNewProduct,
ProductsRecommended, ProductsRecommended,
Live, // Live,
}, },
props: {}, props: {},
data: function() { data: function() {
pages/shop/Live/LiveList/index.vue
+2 -2
View File
@@ -1,4 +1,4 @@
<template> <!-- <template>
<view class="page_box"> <view class="page_box">
<view class="head_box"> <view class="head_box">
<view class="live-tab"> <view class="live-tab">
@@ -179,4 +179,4 @@
padding: 25rpx; padding: 25rpx;
} }
} }
</style> </style> -->
pages/user/User/index.vue
+1 -1
View File
@@ -197,7 +197,7 @@
</view> </view>
<view class="by"> <view class="by">
<view> <view>
<text class="by-text">www.yixiang.co提供技术支持</text> <text class="by-text">@</text>
</view> </view>
</view> </view>
<!-- <SwitchWindow <!-- <SwitchWindow
utils/request.js
+1
View File
@@ -75,6 +75,7 @@ console.log(options)
options.headers = { options.headers = {
...options.headers, ...options.headers,
"tenant-id": '1',
// hahah: 'Bearer2 ', // hahah: 'Bearer2 ',
} }
// if(options.method=='post'){ // if(options.method=='post'){