👍
This commit is contained in:
@@ -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 可配置小程序的 appid
|
||||
- 由于需要兼容 app，公共样式由 main.js 迁移到了 App.vue，公共样式请在 App.vue 中进行编辑
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
## git issuse 地址
|
||||
|
||||
https://gitee.com/guchengwuyue/yshopmall
|
||||
https://gitee.com/guchengwuyue/mall
|
||||
|
||||
### 请按照以下模板提交 issuse
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<template>
|
||||
<!-- <template>
|
||||
<view class="sp-live-card" :style="{ width: wh + 'rpx' }">
|
||||
<view class="live-content" @tap="goRoom" :style="{ width: wh + 'rpx' }">
|
||||
<image class="item-cover" :src="detail.shareImge" mode="aspectFill"></image>
|
||||
@@ -321,4 +321,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style> -->
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="reply" v-if="item.merchantReplyContent">
|
||||
<span class="font-color-red">yshop店员</span>
|
||||
<span class="font-color-red">店员</span>
|
||||
：{{item.merchantReplyContent}}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
// 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 = '/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://natapp.xinxintuan.co/api';
|
||||
// export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
|
||||
|
||||
+10
-11
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name" : "yshopmall",
|
||||
"appid" : "__UNI__CF66760",
|
||||
"name" : "ZSW",
|
||||
"appid" : "__UNI__7085CB1",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.2",
|
||||
"versionCode" : 2,
|
||||
@@ -243,7 +243,7 @@
|
||||
},
|
||||
"quickapp" : {},
|
||||
"mp-weixin" : {
|
||||
"appid" : "wx604d2ea4702620d2",
|
||||
"appid" : "wx2914c96abb4b0be9",
|
||||
"setting" : {
|
||||
"urlCheck" : false
|
||||
},
|
||||
@@ -254,14 +254,13 @@
|
||||
}
|
||||
},
|
||||
// "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
|
||||
"plugins" : {
|
||||
// #ifdef MP-WEIXIN
|
||||
"live-player-plugin" : {
|
||||
"version" : "1.2.8",
|
||||
"provider" : "wx2b03c6e691cd7370"
|
||||
}
|
||||
}
|
||||
"plugins" : {}
|
||||
},
|
||||
// #ifdef MP-WEIXIN
|
||||
// "live-player-plugin" : {
|
||||
// "version" : "1.2.8",
|
||||
// "provider" : "wx2b03c6e691cd7370"
|
||||
// }
|
||||
// #endif
|
||||
"mp-alipay" : {
|
||||
"usingComponents" : true
|
||||
@@ -273,7 +272,7 @@
|
||||
"usingComponents" : true
|
||||
},
|
||||
"h5" : {
|
||||
"title" : "yshop",
|
||||
"title" : "mall",
|
||||
"devServer" : {
|
||||
"disableHostCheck" : true,
|
||||
"proxy" : {
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "yshopmall_uni",
|
||||
"name": "mall_uni",
|
||||
"version": "3.3.0",
|
||||
"description": "",
|
||||
"main": "main.js",
|
||||
|
||||
+12
-14
@@ -3,7 +3,7 @@
|
||||
{
|
||||
"path": "pages/Loading/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "yshop商城"
|
||||
"navigationBarTitleText": "系统"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -40,7 +40,7 @@
|
||||
{
|
||||
"path": "pages/home/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "yshop商城",
|
||||
"navigationBarTitleText": "系统",
|
||||
"navigationBarTextStyle": "white",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
@@ -298,7 +298,7 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/order/OrderReturnDetail/index",
|
||||
"path": "pages/order/OrderReturnDetail/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "售后详情"
|
||||
}
|
||||
@@ -429,16 +429,15 @@
|
||||
"navigationBarTitleText": "地图"
|
||||
}
|
||||
},
|
||||
// {
|
||||
// "path": "pages/shop/Live/LiveList/index",
|
||||
// "style": {
|
||||
// "navigationBarTitleText": "直播列表"
|
||||
// }
|
||||
// },
|
||||
{
|
||||
"path": "pages/shop/Live/LiveList/index",
|
||||
"path": "pages/user/content/content",
|
||||
"style": {
|
||||
"navigationBarTitleText": "直播列表"
|
||||
}
|
||||
}
|
||||
,{
|
||||
"path" : "pages/user/content/content",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
@@ -453,7 +452,7 @@
|
||||
},
|
||||
"globalStyle": {
|
||||
"navigationBarTextStyle": "black",
|
||||
"navigationBarTitleText": "Yshop",
|
||||
"navigationBarTitleText": "ZSW",
|
||||
"navigationBarBackgroundColor": "#F8F8F8",
|
||||
"backgroundColor": "#F8F8F8",
|
||||
"navigationStyle": "default"
|
||||
@@ -467,8 +466,7 @@
|
||||
"fontSize": "10px",
|
||||
"iconWidth": "24px",
|
||||
"spacing": "3px",
|
||||
"list": [
|
||||
{
|
||||
"list": [{
|
||||
"pagePath": "pages/home/index",
|
||||
"iconPath": "static/icon-home.png",
|
||||
"selectedIconPath": "static/icon-home-hot.png",
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
>
|
||||
<view class="force-login__content y-f">
|
||||
<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
|
||||
class="cu-btn author-btn"
|
||||
open-type="getPhoneNumber"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<template>
|
||||
<!-- <template>
|
||||
<view class="live-el mx20 mb10">
|
||||
<view class="head">
|
||||
<text class="head-title">热门直播</text>
|
||||
@@ -243,4 +243,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style> -->
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
:detail="benefit" />
|
||||
<!-- 直播 -->
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<Live v-if="item.type == 'live'" :detail="live" />
|
||||
<!-- <Live v-if="item.type == 'live'" :detail="live" /> -->
|
||||
<!-- #endif -->
|
||||
<!-- 为您推荐 -->
|
||||
<PromotionGood v-if="item.type == 'promotionGood'" :benefit="benefit" />
|
||||
@@ -82,7 +82,7 @@ import Banner from './components/Banner'
|
||||
import HotCommodity from './components/HotCommodity'
|
||||
import FirstNewProduct from './components/FirstNewProduct'
|
||||
import ProductsRecommended from './components/ProductsRecommended'
|
||||
import Live from './components/Live'
|
||||
// import Live from './components/Live'
|
||||
|
||||
import { getHomeData, getShare, getCanvas } from '@/api/public'
|
||||
import cookie from '@/utils/store/cookie'
|
||||
@@ -108,7 +108,7 @@ export default {
|
||||
HotCommodity,
|
||||
FirstNewProduct,
|
||||
ProductsRecommended,
|
||||
Live,
|
||||
// Live,
|
||||
},
|
||||
props: {},
|
||||
data: function() {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<template>
|
||||
<!-- <template>
|
||||
<view class="page_box">
|
||||
<view class="head_box">
|
||||
<view class="live-tab">
|
||||
@@ -179,4 +179,4 @@
|
||||
padding: 25rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style> -->
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
</view>
|
||||
<view class="by">
|
||||
<view>
|
||||
<text class="by-text">www.yixiang.co提供技术支持</text>
|
||||
<text class="by-text">@</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <SwitchWindow
|
||||
|
||||
@@ -75,6 +75,7 @@ console.log(options)
|
||||
|
||||
options.headers = {
|
||||
...options.headers,
|
||||
"tenant-id": '1',
|
||||
// hahah: 'Bearer2 ',
|
||||
}
|
||||
// if(options.method=='post'){
|
||||
|
||||
Reference in New Issue
Block a user