Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41b294f626 |
@@ -20,7 +20,7 @@
|
|||||||
"type" : "uniCloud"
|
"type" : "uniCloud"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"playground" : "custom",
|
"playground" : "standard",
|
||||||
"type" : "uni-app:app-ios"
|
"type" : "uni-app:app-ios"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ let baseUrl = "";
|
|||||||
let socketUrl = "";
|
let socketUrl = "";
|
||||||
if (process.env.NODE_ENV === 'development') {
|
if (process.env.NODE_ENV === 'development') {
|
||||||
//开发环境
|
//开发环境
|
||||||
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
|
baseUrl = "https://api.nuttyreading.com/"; // 线上正式
|
||||||
baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
||||||
} else if (process.env.NODE_ENV === 'production') {
|
} else if (process.env.NODE_ENV === 'production') {
|
||||||
//生产环境
|
//生产环境
|
||||||
// baseUrl = "https://api.nuttyreading.com/";
|
baseUrl = "https://api.nuttyreading.com/";
|
||||||
baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
||||||
}
|
}
|
||||||
const courtConfig = {
|
const courtConfig = {
|
||||||
//微信公众号APPID
|
//微信公众号APPID
|
||||||
|
|||||||
@@ -12,8 +12,8 @@
|
|||||||
"src" : "图片路径"
|
"src" : "图片路径"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"versionName" : "1.2.75",
|
"versionName" : "1.2.76",
|
||||||
"versionCode" : 1275,
|
"versionCode" : 1276,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"compatible" : {
|
"compatible" : {
|
||||||
"ignoreVersion" : true
|
"ignoreVersion" : true
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
||||||
已购图书
|
已购图书
|
||||||
</view>
|
</view>
|
||||||
<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
||||||
推荐图书
|
推荐图书
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="tip">
|
<!-- <view class="tip">
|
||||||
|
|||||||
@@ -100,9 +100,9 @@
|
|||||||
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
||||||
已购图书
|
已购图书
|
||||||
</view>
|
</view>
|
||||||
<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
||||||
推荐图书
|
推荐图书
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="bookList.length > 0">
|
<view v-if="bookList.length > 0">
|
||||||
|
|||||||
@@ -34,9 +34,9 @@
|
|||||||
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
||||||
已购图书
|
已购图书
|
||||||
</view>
|
</view>
|
||||||
<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
||||||
推荐图书
|
推荐图书
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0" v-if="contentShow == 1">
|
<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0" v-if="contentShow == 1">
|
||||||
|
|||||||
@@ -24,9 +24,9 @@
|
|||||||
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
||||||
已购图书
|
已购图书
|
||||||
</view>
|
</view>
|
||||||
<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
||||||
推荐图书
|
推荐图书
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="listenList" v-if="bookList.length > 0 || tjBookLIst.length > 0">
|
<view class="listenList" v-if="bookList.length > 0 || tjBookLIst.length > 0">
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
<!-- <text>讲 书</text> -->
|
<!-- <text>讲 书</text> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
|
<!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
|
||||||
<view class="search">
|
<view class="search">
|
||||||
<text class="icon_search"></text>
|
<text class="icon_search"></text>
|
||||||
<text class="prompt">请输入书名</text>
|
<text class="prompt">请输入书名</text>
|
||||||
@@ -81,7 +81,7 @@
|
|||||||
<view class="searBtn">
|
<view class="searBtn">
|
||||||
<text>书名检索</text>
|
<text>书名检索</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
<!-- 新闻播报 -->
|
<!-- 新闻播报 -->
|
||||||
<view class="fourBox" v-if="newsList.length > 0">
|
<view class="fourBox" v-if="newsList.length > 0">
|
||||||
<view class="newsBox flexbox">
|
<view class="newsBox flexbox">
|
||||||
@@ -99,7 +99,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 营销标签 -->
|
<!-- 营销标签 -->
|
||||||
<scroll-view class="yxTagBox" scroll-x="true">
|
<!-- <scroll-view class="yxTagBox" scroll-x="true">
|
||||||
<view class="ProTabs flexbox">
|
<view class="ProTabs flexbox">
|
||||||
<text v-for="(item, index) in yingxiaoTags" :key="item.id" :class="[yxCurIndex == index ? 'cur' : '']"
|
<text v-for="(item, index) in yingxiaoTags" :key="item.id" :class="[yxCurIndex == index ? 'cur' : '']"
|
||||||
@click="yxTabsChange(item, index)">{{ item.title }}</text>
|
@click="yxTabsChange(item, index)">{{ item.title }}</text>
|
||||||
@@ -131,10 +131,10 @@
|
|||||||
<text>{{ item.title }}</text>
|
<text>{{ item.title }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
<!-- 商品展示 -->
|
<!-- 商品展示 -->
|
||||||
<view class="goods">
|
<!-- <view class="goods">
|
||||||
<!-- 精选 -->
|
|
||||||
<view class="">
|
<view class="">
|
||||||
<view v-if="tjProList.length > 0">
|
<view v-if="tjProList.length > 0">
|
||||||
<view class="flexbox" style="flex-wrap: wrap;">
|
<view class="flexbox" style="flex-wrap: wrap;">
|
||||||
@@ -150,7 +150,6 @@
|
|||||||
|
|
||||||
<text v-if="item.is_vip_price==1&&item.vip_price!=0">
|
<text v-if="item.is_vip_price==1&&item.vip_price!=0">
|
||||||
<text style="color: #e97512;font-size: 12px;font-weight: bold;">¥{{(item.vip_price).toFixed(2)}}</text>
|
<text style="color: #e97512;font-size: 12px;font-weight: bold;">¥{{(item.vip_price).toFixed(2)}}</text>
|
||||||
<!-- <text style="color: #fa2d12;font-size: 10px;margin-left: 4px;">VIP到手价</text> -->
|
|
||||||
<text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">¥{{(item.price).toFixed(2)}}</text>
|
<text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">¥{{(item.price).toFixed(2)}}</text>
|
||||||
|
|
||||||
|
|
||||||
@@ -160,7 +159,6 @@
|
|||||||
<text
|
<text
|
||||||
v-else-if="item.activity_price && item.activity_price > 0">
|
v-else-if="item.activity_price && item.activity_price > 0">
|
||||||
<text style="color: #e97512;font-size: 12px;font-weight: bold;">¥{{(item.activity_price).toFixed(2)}}</text>
|
<text style="color: #e97512;font-size: 12px;font-weight: bold;">¥{{(item.activity_price).toFixed(2)}}</text>
|
||||||
<!-- <text style="color: #613804;font-size: 10px;margin-left: 4px;">活动价</text> -->
|
|
||||||
<text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">¥{{(item.price).toFixed(2)}}</text>
|
<text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">¥{{(item.price).toFixed(2)}}</text>
|
||||||
|
|
||||||
|
|
||||||
@@ -195,7 +193,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<u-divider v-else text="暂无数据哦~"></u-divider>
|
<u-divider v-else text="暂无数据哦~"></u-divider>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
|
|
||||||
<view>
|
<view>
|
||||||
<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle="bgiStyle" :iconStyle="iconStyle"></u-back-top>
|
<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle="bgiStyle" :iconStyle="iconStyle"></u-back-top>
|
||||||
|
|||||||
@@ -58,9 +58,9 @@
|
|||||||
<view class="nav_list" @click="onPageJump('../bookShop/orderList')">
|
<view class="nav_list" @click="onPageJump('../bookShop/orderList')">
|
||||||
<text>我的订单</text>
|
<text>我的订单</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="nav_list" @click="onPageJump('../peanut/shopping')">
|
<!-- <view class="nav_list" @click="onPageJump('../peanut/shopping')">
|
||||||
<text>购物车</text>
|
<text>购物车</text>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="nav_list" @click="onPageJump('../user/persData')">
|
<view class="nav_list" @click="onPageJump('../user/persData')">
|
||||||
<text>修改个人资料</text>
|
<text>修改个人资料</text>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -9,9 +9,9 @@
|
|||||||
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
||||||
已购图书
|
已购图书
|
||||||
</view>
|
</view>
|
||||||
<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
||||||
推荐图书
|
推荐图书
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="tip">
|
<!-- <view class="tip">
|
||||||
|
|||||||
@@ -12,9 +12,9 @@
|
|||||||
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
|
||||||
已购图书
|
已购图书
|
||||||
</view>
|
</view>
|
||||||
<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
|
||||||
推荐图书
|
推荐图书
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="mainContainer">
|
<view class="mainContainer">
|
||||||
|
|||||||
Reference in New Issue
Block a user