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

👍

master
Boom 1 year ago
parent
3e08136bfa
commit
7f4aecb936
13 changed files with 519 additions and 521 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      README.md
  2. 4
      components/ShopLiveCard.vue
  3. 2
      components/UserEvaluation.vue
  4. 2
      config/index.js
  5. 21
      manifest.json
  6. 2
      package.json
  7. 984
      pages.json
  8. 2
      pages/authorization/index.vue
  9. 4
      pages/home/components/Live.vue
  10. 6
      pages/home/index.vue
  11. 4
      pages/shop/Live/LiveList/index.vue
  12. 4
      pages/user/User/index.vue
  13. 1
      utils/request.js

4
README.md
Unescape 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

4
components/ShopLiveCard.vue
Unescape 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> -->

2
components/UserEvaluation.vue
Unescape 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>

2
config/index.js
Unescape 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'

21
manifest.json
Unescape 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" : {

2
package.json
Unescape 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",

984
pages.json
Unescape View File

@ -1,497 +1,495 @@
{ {
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/Loading/index", "path": "pages/Loading/index",
"style": { "style": {
"navigationBarTitleText": "yshop商城" "navigationBarTitleText": "系统"
} }
}, },
{ {
"path": "pages/authorization/index", "path": "pages/authorization/index",
"style": { "style": {
"navigationBarTitleText": "微信授权" "navigationBarTitleText": "微信授权"
} }
}, },
{ {
"path": "pages/user/Login/index", "path": "pages/user/Login/index",
"style": { "style": {
"navigationBarTitleText": "登录" "navigationBarTitleText": "登录"
} }
}, },
{ {
"path": "pages/user/Register/index", "path": "pages/user/Register/index",
"style": { "style": {
"navigationBarTitleText": "注册" "navigationBarTitleText": "注册"
} }
}, },
{ {
// "path": "pages/user/RetrievePassword/index", // "path": "pages/user/RetrievePassword/index",
"path": "pages/user/ChangePassword/index", "path": "pages/user/ChangePassword/index",
"style": { "style": {
"navigationBarTitleText": "重置密码" "navigationBarTitleText": "重置密码"
} }
}, },
{ {
"path": "pages/launch/index", "path": "pages/launch/index",
"style": { "style": {
"navigationBarTitleText": "首页" "navigationBarTitleText": "首页"
} }
}, },
{ {
"path": "pages/home/index", "path": "pages/home/index",
"style": { "style": {
"navigationBarTitleText": "yshop商城", "navigationBarTitleText": "系统",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "pages/shop/GoodSearch/index", "path": "pages/shop/GoodSearch/index",
"style": { "style": {
"navigationBarTitleText": "搜索商品" "navigationBarTitleText": "搜索商品"
} }
}, },
{ {
"path": "pages/shop/GoodsClass/index", "path": "pages/shop/GoodsClass/index",
"style": { "style": {
"navigationBarTitleText": "商品分类" "navigationBarTitleText": "商品分类"
} }
}, },
{ {
"path": "pages/shop/ShoppingCart/index", "path": "pages/shop/ShoppingCart/index",
"style": { "style": {
"navigationBarTitleText": "购物车" "navigationBarTitleText": "购物车"
} }
}, },
{ {
"path": "pages/shop/StoreList/index", "path": "pages/shop/StoreList/index",
"style": { "style": {
"navigationBarTitleText": "商家列表" "navigationBarTitleText": "商家列表"
} }
}, },
{ {
"path": "pages/shop/GoodsList/index", "path": "pages/shop/GoodsList/index",
"style": { "style": {
"navigationBarTitleText": "商品列表" "navigationBarTitleText": "商品列表"
} }
}, },
{ {
"path": "pages/NotDefined/index", "path": "pages/NotDefined/index",
"style": { "style": {
"navigationBarTitleText": "404" "navigationBarTitleText": "404"
} }
}, },
{ {
"path": "pages/user/User/index", "path": "pages/user/User/index",
"style": { "style": {
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的"
} }
}, },
{ {
"path": "pages/shop/GoodsCollection/index", "path": "pages/shop/GoodsCollection/index",
"style": { "style": {
"navigationBarTitleText": "商品收藏" "navigationBarTitleText": "商品收藏"
} }
}, },
{ {
"path": "pages/shop/GoodsFoot/index", "path": "pages/shop/GoodsFoot/index",
"style": { "style": {
"navigationBarTitleText": "我的足迹" "navigationBarTitleText": "我的足迹"
} }
}, },
{ {
"path": "pages/shop/news/NewsDetail/index", "path": "pages/shop/news/NewsDetail/index",
"style": { "style": {
"navigationBarTitleText": "新闻详情" "navigationBarTitleText": "新闻详情"
} }
}, },
{ {
"path": "pages/shop/news/NewsList/index", "path": "pages/shop/news/NewsList/index",
"style": { "style": {
"navigationBarTitleText": "新闻列表" "navigationBarTitleText": "新闻列表"
} }
}, },
{ {
"path": "pages/shop/EvaluateList/index", "path": "pages/shop/EvaluateList/index",
"style": { "style": {
"navigationBarTitleText": "评价列表" "navigationBarTitleText": "评价列表"
} }
}, },
{ {
"path": "pages/shop/GoodsEvaluate/index", "path": "pages/shop/GoodsEvaluate/index",
"style": { "style": {
"navigationBarTitleText": "商品评价" "navigationBarTitleText": "商品评价"
} }
}, },
{ {
"path": "pages/shop/GoodsPromotion/index", "path": "pages/shop/GoodsPromotion/index",
"style": { "style": {
"navigationBarTitleText": "促销商品" "navigationBarTitleText": "促销商品"
} }
}, },
{ {
"path": "pages/shop/HotNewGoods/index", "path": "pages/shop/HotNewGoods/index",
"style": { "style": {
"navigationBarTitleText": "热门商品" "navigationBarTitleText": "热门商品"
} }
}, },
{ {
"path": "pages/shop/GoodsCon/index", "path": "pages/shop/GoodsCon/index",
"style": { "style": {
"navigationBarTitleText": "商品详情" "navigationBarTitleText": "商品详情"
} }
}, },
{ {
"path": "pages/shop/IntegralGoodsCon/index", "path": "pages/shop/IntegralGoodsCon/index",
"style": { "style": {
"navigationBarTitleText": "积分商品详情" "navigationBarTitleText": "积分商品详情"
} }
}, },
{ {
"path": "pages/user/BindingPhone/index", "path": "pages/user/BindingPhone/index",
"style": { "style": {
"navigationBarTitleText": "绑定手机号" "navigationBarTitleText": "绑定手机号"
} }
}, },
{ {
"path": "pages/user/address/AddAddress/index", "path": "pages/user/address/AddAddress/index",
"style": { "style": {
"navigationBarTitleText": "新增收货地址" "navigationBarTitleText": "新增收货地址"
} }
}, },
{ {
"path": "pages/user/UserAccount/index", "path": "pages/user/UserAccount/index",
"style": { "style": {
"navigationBarTitleText": "账户余额" "navigationBarTitleText": "账户余额"
} }
}, },
{ {
"path": "pages/user/address/AddressManagement/index", "path": "pages/user/address/AddressManagement/index",
"style": { "style": {
"navigationBarTitleText": "收货地址" "navigationBarTitleText": "收货地址"
} }
}, },
{ {
"path": "pages/user/promotion/Poster/index", "path": "pages/user/promotion/Poster/index",
"style": { "style": {
"navigationBarTitleText": "推广名片" "navigationBarTitleText": "推广名片"
} }
}, },
{ {
"path": "pages/user/signIn/Sign/index", "path": "pages/user/signIn/Sign/index",
"style": { "style": {
"navigationBarTitleText": "签到" "navigationBarTitleText": "签到"
} }
}, },
{ {
"path": "pages/user/signIn/SignRecord/index", "path": "pages/user/signIn/SignRecord/index",
"style": { "style": {
"navigationBarTitleText": "签到记录" "navigationBarTitleText": "签到记录"
} }
}, },
{ {
"path": "pages/user/promotion/CashAudit/index", "path": "pages/user/promotion/CashAudit/index",
"style": { "style": {
"navigationBarTitleText": "提现结果" "navigationBarTitleText": "提现结果"
} }
}, },
{ {
"path": "pages/user/promotion/PromoterOrder/index", "path": "pages/user/promotion/PromoterOrder/index",
"style": { "style": {
"navigationBarTitleText": "分销详情" "navigationBarTitleText": "分销详情"
} }
}, },
{ {
"path": "pages/user/promotion/PromoterList/index", "path": "pages/user/promotion/PromoterList/index",
"style": { "style": {
"navigationBarTitleText": "分销列表" "navigationBarTitleText": "分销列表"
} }
}, },
{ {
"path": "pages/user/promotion/UserPromotion/index", "path": "pages/user/promotion/UserPromotion/index",
"style": { "style": {
"navigationBarTitleText": "佣金" "navigationBarTitleText": "佣金"
} }
}, },
{ {
"path": "pages/user/UserBill/index", "path": "pages/user/UserBill/index",
"style": { "style": {
"navigationBarTitleText": "账单记录" "navigationBarTitleText": "账单记录"
} }
}, },
{ {
"path": "pages/user/promotion/CashRecord/index", "path": "pages/user/promotion/CashRecord/index",
"style": { "style": {
"navigationBarTitleText": "提现记录" "navigationBarTitleText": "提现记录"
} }
}, },
{ {
"path": "pages/user/promotion/CommissionDetails/index", "path": "pages/user/promotion/CommissionDetails/index",
"style": { "style": {
"navigationBarTitleText": "佣金明细" "navigationBarTitleText": "佣金明细"
} }
}, },
{ {
"path": "pages/user/signIn/Integral/index", "path": "pages/user/signIn/Integral/index",
"style": { "style": {
"navigationBarTitleText": "我的积分" "navigationBarTitleText": "我的积分"
} }
}, },
{ {
"path": "pages/user/UserVip/index", "path": "pages/user/UserVip/index",
"style": { "style": {
"navigationBarTitleText": "用户vip" "navigationBarTitleText": "用户vip"
} }
}, },
{ {
"path": "pages/user/PersonalData/index", "path": "pages/user/PersonalData/index",
"style": { "style": {
"navigationBarTitleText": "个人资料" "navigationBarTitleText": "个人资料"
} }
}, },
{ {
"path": "pages/user/coupon/UserCoupon/index", "path": "pages/user/coupon/UserCoupon/index",
"style": { "style": {
"navigationBarTitleText": "优惠券" "navigationBarTitleText": "优惠券"
} }
}, },
{ {
"path": "pages/user/coupon/GetCoupon/index", "path": "pages/user/coupon/GetCoupon/index",
"style": { "style": {
"navigationBarTitleText": "领取优惠券" "navigationBarTitleText": "领取优惠券"
} }
}, },
{ {
"path": "pages/user/promotion/UserCash/index", "path": "pages/user/promotion/UserCash/index",
"style": { "style": {
"navigationBarTitleText": "提现" "navigationBarTitleText": "提现"
} }
}, },
{ {
"path": "pages/user/CustomerList/index", "path": "pages/user/CustomerList/index",
"style": { "style": {
"navigationBarTitleText": "客服列表" "navigationBarTitleText": "客服列表"
} }
}, },
{ {
"path": "pages/user/Recharge/index", "path": "pages/user/Recharge/index",
"style": { "style": {
"navigationBarTitleText": "充值" "navigationBarTitleText": "充值"
} }
}, },
{ {
"path": "pages/order/MyOrder/index", "path": "pages/order/MyOrder/index",
"style": { "style": {
"navigationBarTitleText": "我的订单" "navigationBarTitleText": "我的订单"
} }
}, },
{ {
"path": "pages/order/Logistics/index", "path": "pages/order/Logistics/index",
"style": { "style": {
"navigationBarTitleText": "查看物流" "navigationBarTitleText": "查看物流"
} }
}, },
{ {
"path": "pages/order/OrderDetails/index", "path": "pages/order/OrderDetails/index",
"style": { "style": {
"navigationBarTitleText": "订单详情" "navigationBarTitleText": "订单详情"
} }
}, },
{ {
"path" : "pages/order/OrderReturnDetail/index", "path": "pages/order/OrderReturnDetail/index",
"style": { "style": {
"navigationBarTitleText": "售后详情" "navigationBarTitleText": "售后详情"
}
},
{
"path": "pages/order/OrderSubmission/index",
"style": {
"navigationBarTitleText": "提交订单"
}
},
{
"path": "pages/order/PaymentStatus/index",
"style": {
"navigationBarTitleText": "支付状态"
}
},
{
"path": "pages/order/GoodsReturn/index",
"style": {
"navigationBarTitleText": "商品退货"
}
},
{
"path": "pages/order/ReturnList/index",
"style": {
"navigationBarTitleText": "我的售后"
}
},
{
"path": "pages/order/submitExpress/index",
"style": {
"navigationBarTitleText": "售后物流填写"
}
},
{
"path": "pages/orderAdmin/OrderIndex/index",
"style": {
"navigationBarTitleText": "商家订单统计"
}
},
{
"path": "pages/orderAdmin/AdminOrderList/index",
"style": {
"navigationBarTitleText": "订单"
}
},
{
"path": "pages/orderAdmin/GoodsDeliver/index",
"style": {
"navigationBarTitleText": "发货"
}
},
{
"path": "pages/orderAdmin/AdminOrder/index",
"style": {
"navigationBarTitleText": "商家订单列表"
}
},
{
"path": "pages/orderAdmin/Statistics/index",
"style": {
"navigationBarTitleText": "商家统计数据"
}
},
{
"path": "pages/orderAdmin/OrderCancellation/index",
"style": {
"navigationBarTitleText": "商家核销订单"
}
},
{
"path": "pages/activity/Poster/index",
"style": {
"navigationBarTitleText": "推广海报"
}
},
{
"path": "pages/activity/DargainDetails/index",
"style": {
"navigationBarTitleText": "帮砍价"
}
},
{
"path": "pages/activity/GoodsBargain/index",
"style": {
"navigationBarTitleText": "砍价列表"
}
},
{
"path": "pages/activity/BargainRecord/index",
"style": {
"navigationBarTitleText": "砍价记录"
}
},
{
"path": "pages/activity/GoodsGroup/index",
"style": {
"navigationBarTitleText": "团购商品列表"
}
},
{
"path": "pages/activity/GroupDetails/index",
"style": {
"navigationBarTitleText": "团购商品详情"
}
},
{
"path": "pages/activity/GroupRule/index",
"style": {
"navigationBarTitleText": "团购规则"
}
},
{
"path": "pages/activity/GoodsSeckill/index",
"style": {
"navigationBarTitleText": "秒杀"
}
},
{
"path": "pages/activity/SeckillDetails/index",
"style": {
"navigationBarTitleText": "秒杀详情"
}
},
{
"path": "pages/map/index",
"style": {
"navigationBarTitleText": "地图"
}
},
// {
// "path": "pages/shop/Live/LiveList/index",
// "style": {
// "navigationBarTitleText": "直播列表"
// }
// },
{
"path": "pages/user/content/content",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
],
"easycom": {
"autoscan": true,
"custom": {
"tui-(.*)": "@/components/tui-$1/tui-$1.vue"
} }
}, },
{ "globalStyle": {
"path": "pages/order/OrderSubmission/index", "navigationBarTextStyle": "black",
"style": { "navigationBarTitleText": "ZSW",
"navigationBarTitleText": "提交订单" "navigationBarBackgroundColor": "#F8F8F8",
} "backgroundColor": "#F8F8F8",
}, "navigationStyle": "default"
{
"path": "pages/order/PaymentStatus/index",
"style": {
"navigationBarTitleText": "支付状态"
}
},
{
"path": "pages/order/GoodsReturn/index",
"style": {
"navigationBarTitleText": "商品退货"
}
},
{
"path": "pages/order/ReturnList/index",
"style": {
"navigationBarTitleText": "我的售后"
}
},
{
"path": "pages/order/submitExpress/index",
"style": {
"navigationBarTitleText": "售后物流填写"
}
}, },
{ "tabBar": {
"path": "pages/orderAdmin/OrderIndex/index", "color": "#282828",
"style": { "selectedColor": "#eb3729",
"navigationBarTitleText": "商家订单统计" "borderStyle": "black",
} "backgroundColor": "#ffffff",
}, "height": "50px",
{ "fontSize": "10px",
"path": "pages/orderAdmin/AdminOrderList/index", "iconWidth": "24px",
"style": { "spacing": "3px",
"navigationBarTitleText": "订单" "list": [{
} "pagePath": "pages/home/index",
}, "iconPath": "static/icon-home.png",
{ "selectedIconPath": "static/icon-home-hot.png",
"path": "pages/orderAdmin/GoodsDeliver/index", "text": "首页"
"style": { },
"navigationBarTitleText": "发货" {
} "pagePath": "pages/shop/GoodsClass/index",
}, "iconPath": "static/icon-class.png",
{ "selectedIconPath": "static/icon-class-hot.png",
"path": "pages/orderAdmin/AdminOrder/index", "text": "分类"
"style": { },
"navigationBarTitleText": "商家订单列表" {
} "pagePath": "pages/shop/ShoppingCart/index",
}, "iconPath": "static/icon-cart.png",
{ "selectedIconPath": "static/icon-cart-hot.png",
"path": "pages/orderAdmin/Statistics/index", "text": "购物车"
"style": { },
"navigationBarTitleText": "商家统计数据" {
} "pagePath": "pages/user/User/index",
}, "iconPath": "static/icon-user.png",
{ "selectedIconPath": "static/icon-user-hot.png",
"path": "pages/orderAdmin/OrderCancellation/index", "text": "我的"
"style": { }
"navigationBarTitleText": "商家核销订单" ]
} }
}, }
{
"path": "pages/activity/Poster/index",
"style": {
"navigationBarTitleText": "推广海报"
}
},
{
"path": "pages/activity/DargainDetails/index",
"style": {
"navigationBarTitleText": "帮砍价"
}
},
{
"path": "pages/activity/GoodsBargain/index",
"style": {
"navigationBarTitleText": "砍价列表"
}
},
{
"path": "pages/activity/BargainRecord/index",
"style": {
"navigationBarTitleText": "砍价记录"
}
},
{
"path": "pages/activity/GoodsGroup/index",
"style": {
"navigationBarTitleText": "团购商品列表"
}
},
{
"path": "pages/activity/GroupDetails/index",
"style": {
"navigationBarTitleText": "团购商品详情"
}
},
{
"path": "pages/activity/GroupRule/index",
"style": {
"navigationBarTitleText": "团购规则"
}
},
{
"path": "pages/activity/GoodsSeckill/index",
"style": {
"navigationBarTitleText": "秒杀"
}
},
{
"path": "pages/activity/SeckillDetails/index",
"style": {
"navigationBarTitleText": "秒杀详情"
}
},
{
"path": "pages/map/index",
"style": {
"navigationBarTitleText": "地图"
}
},
{
"path": "pages/shop/Live/LiveList/index",
"style": {
"navigationBarTitleText": "直播列表"
}
}
,{
"path" : "pages/user/content/content",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
],
"easycom": {
"autoscan": true,
"custom": {
"tui-(.*)": "@/components/tui-$1/tui-$1.vue"
}
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "Yshop",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
"navigationStyle": "default"
},
"tabBar": {
"color": "#282828",
"selectedColor": "#eb3729",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"height": "50px",
"fontSize": "10px",
"iconWidth": "24px",
"spacing": "3px",
"list": [
{
"pagePath": "pages/home/index",
"iconPath": "static/icon-home.png",
"selectedIconPath": "static/icon-home-hot.png",
"text": "首页"
},
{
"pagePath": "pages/shop/GoodsClass/index",
"iconPath": "static/icon-class.png",
"selectedIconPath": "static/icon-class-hot.png",
"text": "分类"
},
{
"pagePath": "pages/shop/ShoppingCart/index",
"iconPath": "static/icon-cart.png",
"selectedIconPath": "static/icon-cart-hot.png",
"text": "购物车"
},
{
"pagePath": "pages/user/User/index",
"iconPath": "static/icon-user.png",
"selectedIconPath": "static/icon-user-hot.png",
"text": "我的"
}
]
}
}

2
pages/authorization/index.vue
Unescape 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"

4
pages/home/components/Live.vue
Unescape 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> -->

6
pages/home/index.vue
Unescape 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() {

4
pages/shop/Live/LiveList/index.vue
Unescape 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> -->

4
pages/user/User/index.vue
Unescape 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
@ -482,7 +482,7 @@ export default {
}, },
}, },
onShow() { onShow() {
if (this.$store.getters.token) { if (this.$store.getters.token) {
console.log('userInfo11:',this.$store.getters.token) console.log('userInfo11:',this.$store.getters.token)
// //
uni.showLoading({ uni.showLoading({

1
utils/request.js
Unescape 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'){

Write Preview
Loading…
Cancel
Save