tijiao
This commit is contained in:
@@ -2,12 +2,12 @@ let baseUrl = "";
|
|||||||
let socketUrl = "";
|
let socketUrl = "";
|
||||||
if (process.env.NODE_ENV === 'development') {
|
if (process.env.NODE_ENV === 'development') {
|
||||||
// 开发环境
|
// 开发环境
|
||||||
//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
||||||
baseUrl = "https://api.nuttyreading.com/"; // 线上正式
|
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
|
||||||
} else if (process.env.NODE_ENV === 'production') {
|
} else if (process.env.NODE_ENV === 'production') {
|
||||||
// 生产环境11
|
// 生产环境11
|
||||||
//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
|
||||||
baseUrl = "https://api.nuttyreading.com/"; //1
|
// baseUrl = "https://api.nuttyreading.com/"; //1
|
||||||
}
|
}
|
||||||
const courtConfig = {
|
const courtConfig = {
|
||||||
//微信公众号APPID
|
//微信公众号APPID
|
||||||
|
|||||||
@@ -18,7 +18,42 @@
|
|||||||
|
|
||||||
<view :class="`common_radius_box goods_box popup_content`">
|
<view :class="`common_radius_box goods_box popup_content`">
|
||||||
<view class="title title_box"
|
<view class="title title_box"
|
||||||
><text class="title_price">¥{{ selectGoodsData.activityPrice?selectGoodsData.activityPrice:selectGoodsData.price }}</text
|
>
|
||||||
|
|
||||||
|
|
||||||
|
<text
|
||||||
|
v-if="
|
||||||
|
selectGoodsData.isVipPrice == 1 &&
|
||||||
|
selectGoodsData.vipPrice != 0 &&
|
||||||
|
selectGoodsData.vipPrice != null
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<text style="color: #e97512; font-weight: bold"
|
||||||
|
>¥{{ selectGoodsData.vipPrice.toFixed(2) }}</text
|
||||||
|
>
|
||||||
|
<text style="color: #fa2d12; font-size: 12px; margin-left: 4px"
|
||||||
|
>VIP到手价</text
|
||||||
|
>
|
||||||
|
<!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">¥{{(selectGoodsData.price).toFixed(2)}}</text> -->
|
||||||
|
</text>
|
||||||
|
|
||||||
|
<text
|
||||||
|
v-else-if="
|
||||||
|
selectGoodsData.activityPrice &&
|
||||||
|
selectGoodsData.activityPrice > 0
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<text style="color: #e97512; font-weight: bold"
|
||||||
|
>¥{{ selectGoodsData.activityPrice.toFixed(2) }}</text
|
||||||
|
>
|
||||||
|
<text style="color: #613804; font-size: 12px; margin-left: 4px"
|
||||||
|
>活动价</text
|
||||||
|
>
|
||||||
|
<!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">¥{{(selectGoodsData.price).toFixed(2)}}</text> -->
|
||||||
|
</text>
|
||||||
|
|
||||||
|
<text v-else style="color: #e97512; font-weight: bold">
|
||||||
|
¥{{ Number(selectGoodsData.price).toFixed(2) }}</text
|
||||||
>
|
>
|
||||||
<u-icon
|
<u-icon
|
||||||
name="close"
|
name="close"
|
||||||
@@ -63,11 +98,35 @@
|
|||||||
|
|
||||||
<view :class="`goods_info `">
|
<view :class="`goods_info `">
|
||||||
<view class="name">{{ slotProps.row.productName }}</view>
|
<view class="name">{{ slotProps.row.productName }}</view>
|
||||||
<view class="price" style="color: #3ab3ae"
|
<view class="flex_box" style="align-items: center">
|
||||||
|
<!-- <text style="color: #999; text-decoration: line-through; margin-right: 20rpx;"
|
||||||
|
v-if="slotProps.row.activityPrice > 0 && slotProps.row.activityPrice < slotProps.row.price" >¥{{slotProps.row.price}}</text>
|
||||||
|
<view class="price" style="color: #258feb"
|
||||||
>¥{{ slotProps.row.activityPrice?slotProps.row.activityPrice:slotProps.row.price }}</view
|
>¥{{ slotProps.row.activityPrice?slotProps.row.activityPrice:slotProps.row.price }}</view
|
||||||
></view
|
></view
|
||||||
|
> -->
|
||||||
|
<text v-html="getPrice(slotProps)"></text>
|
||||||
|
|
||||||
|
<text
|
||||||
|
v-if="
|
||||||
|
slotProps.row.isVipPrice == 1 &&
|
||||||
|
slotProps.row.vipPrice != 0 &&
|
||||||
|
slotProps.row.vipPrice != null
|
||||||
|
"
|
||||||
|
style="
|
||||||
|
z-index: 10;
|
||||||
|
|
||||||
|
margin-left: 10rpx;
|
||||||
|
|
||||||
|
font-size: 20rpx;
|
||||||
|
color: #f94f04;
|
||||||
|
|
||||||
|
font-weight: bold;
|
||||||
|
"
|
||||||
|
>VIP优惠</text
|
||||||
>
|
>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
|
<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
|
||||||
</template>
|
</template>
|
||||||
@@ -122,6 +181,39 @@ export default {
|
|||||||
...mapState(["userInfo"]),
|
...mapState(["userInfo"]),
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getPrice(slotProps) {
|
||||||
|
if (
|
||||||
|
Number(slotProps.row.isVipPrice) === 1 &&
|
||||||
|
Number(slotProps.row.vipPrice) > 0
|
||||||
|
) {
|
||||||
|
return `
|
||||||
|
<text style="color: #e97512; font-size: 12px; font-weight: bold;">
|
||||||
|
¥${Number(slotProps.row.vipPrice).toFixed(2)}
|
||||||
|
</text>
|
||||||
|
<text
|
||||||
|
style="color: #8a8a8a; font-size: 10px; margin-left: 4px; font-weight: bold; text-decoration: line-through;"
|
||||||
|
>
|
||||||
|
¥${Number(slotProps.row.price).toFixed(2)}
|
||||||
|
</text>
|
||||||
|
`;
|
||||||
|
} else if (Number(slotProps.row.activityPrice) > 0) {
|
||||||
|
return `
|
||||||
|
<text style="color: #e97512; font-size: 12px; font-weight: bold;">
|
||||||
|
¥${Number(slotProps.row.activityPrice).toFixed(2)}
|
||||||
|
</text>
|
||||||
|
<text
|
||||||
|
style="color: #8a8a8a; font-size: 10px; margin-left: 4px; font-weight: bold; text-decoration: line-through;"
|
||||||
|
>
|
||||||
|
¥${Number(slotProps.row.price).toFixed(2)}
|
||||||
|
</text>
|
||||||
|
`;
|
||||||
|
} else {
|
||||||
|
return `<span style="color: #e97512;">
|
||||||
|
¥${Number(slotProps.row.price).toFixed(2)}</span>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
// 放大图片
|
// 放大图片
|
||||||
previewImage(url) {
|
previewImage(url) {
|
||||||
console.log(url);
|
console.log(url);
|
||||||
|
|||||||
@@ -43,15 +43,12 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="xianshimaiosha_box">
|
<view class="xianshimaiosha_box" >
|
||||||
<text class="xianshimaiosha">秒杀商品</text>
|
<text class="xianshimaiosha" v-if="curriculumData.isVipPrice == 1 &&
|
||||||
|
curriculumData.vipPrice != 0 &&
|
||||||
<!-- <view class="countdown">
|
curriculumData.vipPrice != null">VIP优惠</text>
|
||||||
|
<text class="xianshimaiosha" v-else-if=" curriculumData.activityPrice &&
|
||||||
<text style="margin-right: 8rpx;">距结束</text>
|
curriculumData.activityPrice > 0">活动立减</text>
|
||||||
<uni-countdown :day="1" :hour="2" :minute="30" :second="0" color="#FFFFFF"
|
|
||||||
:font-size="12" backgroundColor="#000" />
|
|
||||||
</view> -->
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|||||||
929
unpackage/dist/dev/app-plus/app-service.js
vendored
929
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
731
unpackage/dist/dev/app-plus/app-view.js
vendored
731
unpackage/dist/dev/app-plus/app-view.js
vendored
File diff suppressed because it is too large
Load Diff
@@ -2137,9 +2137,9 @@ var S = "development" === "development",
|
|||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
"192.168.110.157"
|
"192.168.110.157"
|
||||||
],
|
],
|
||||||
"debugPort": 9002,
|
"debugPort": 9000,
|
||||||
"initialLaunchType": "local",
|
"initialLaunchType": "local",
|
||||||
"servePort": 7002,
|
"servePort": 7000,
|
||||||
"skipFiles": [
|
"skipFiles": [
|
||||||
"<node_internals>/**",
|
"<node_internals>/**",
|
||||||
"D:/软件/软件/HBuilderX/plugins/unicloud/**/*.js"
|
"D:/软件/软件/HBuilderX/plugins/unicloud/**/*.js"
|
||||||
|
|||||||
@@ -2147,9 +2147,9 @@ var S = "development" === "development",
|
|||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
"192.168.110.157"
|
"192.168.110.157"
|
||||||
],
|
],
|
||||||
"debugPort": 9002,
|
"debugPort": 9000,
|
||||||
"initialLaunchType": "local",
|
"initialLaunchType": "local",
|
||||||
"servePort": 7002,
|
"servePort": 7000,
|
||||||
"skipFiles": [
|
"skipFiles": [
|
||||||
"<node_internals>/**",
|
"<node_internals>/**",
|
||||||
"D:/软件/软件/HBuilderX/plugins/unicloud/**/*.js"
|
"D:/软件/软件/HBuilderX/plugins/unicloud/**/*.js"
|
||||||
|
|||||||
@@ -2137,9 +2137,9 @@ var S = "development" === "development",
|
|||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
"192.168.110.157"
|
"192.168.110.157"
|
||||||
],
|
],
|
||||||
"debugPort": 9002,
|
"debugPort": 9000,
|
||||||
"initialLaunchType": "local",
|
"initialLaunchType": "local",
|
||||||
"servePort": 7002,
|
"servePort": 7000,
|
||||||
"skipFiles": [
|
"skipFiles": [
|
||||||
"<node_internals>/**",
|
"<node_internals>/**",
|
||||||
"D:/软件/软件/HBuilderX/plugins/unicloud/**/*.js"
|
"D:/软件/软件/HBuilderX/plugins/unicloud/**/*.js"
|
||||||
|
|||||||
Reference in New Issue
Block a user