This commit is contained in:
parent
2972699741
commit
9ab223b54f
|
|
@ -6,12 +6,12 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
|
|||
let openPlantGrass = '-openPlantGrass-'
|
||||
|
||||
// 网络接口修改此字符 小程序域名要求https
|
||||
// let httpApi = 'http://192.168.1.3:8080' //测试
|
||||
let httpApi = 'https://api.tropjoin.com' //生产
|
||||
let httpApi = 'http://192.168.1.24:8080' //测试
|
||||
// let httpApi = 'https://api.tropjoin.com' //生产
|
||||
|
||||
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net
|
||||
// let wsApi = 'ws://192.168.1.3:8080'
|
||||
let wsApi = 'wss://ws.tropjoin.com'
|
||||
let wsApi = 'ws://192.168.1.24:8080'
|
||||
// let wsApi = 'wss://ws.tropjoin.com'
|
||||
|
||||
module.exports = {
|
||||
// 请求域名 格式： https://您的域名
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
"name" : "铸源优品",
|
||||
"appid" : "__UNI__496DF55",
|
||||
"description" : "",
|
||||
"versionName" : "1.1.0",
|
||||
"versionCode" : 137,
|
||||
"versionName" : "1.1.2",
|
||||
"versionCode" : 139,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
|
|
|||
|
|
@ -348,6 +348,12 @@
|
|||
"navigationBarTitleText": "修改手机号"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "user_luckyDraw/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "抽奖"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "user_modify_pwd/index",
|
||||
"style": {
|
||||
|
|
|
|||
|
|
@ -298,6 +298,16 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="product-intro">
|
||||
<view class='notice_conter' v-if="notice">
|
||||
<!-- #ifndef APP-PLUS -->
|
||||
<jyf-parser v-if="notice" :domain='domain' :html="notice.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<view v-if="notice" class="description" v-html="notice.replace(/<br\/>/ig, '')"></view>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
</view>
|
||||
<view class='product-intro' id="past3">
|
||||
<view class='title'>产品介绍</view>
|
||||
<view class='conter' v-if="description">
|
||||
|
|
@ -561,6 +571,7 @@
|
|||
activity: [],
|
||||
retunTop: true, //顶部返回
|
||||
navH: "",
|
||||
notice:'',
|
||||
navList: [],
|
||||
opacity: 0,
|
||||
scrollY: 0,
|
||||
|
|
@ -891,6 +902,14 @@
|
|||
|
||||
});
|
||||
},
|
||||
// /*获取公告说明*/
|
||||
// getNoticeRule() {
|
||||
// priceRuleApi(this.storeInfo.cate_id).then(res => {
|
||||
// this.notice = res.data
|
||||
// }).catch(err => {
|
||||
|
||||
// });
|
||||
// },
|
||||
goActivity: function(e) {
|
||||
let item = e;
|
||||
if (item.type === "1") {
|
||||
|
|
@ -1117,6 +1136,7 @@
|
|||
that.$set(that, 'storeImage', that.storeInfo.image);
|
||||
getProductParmas(that.id).then((res) => {
|
||||
that.$set(that, 'description', res.data.content);
|
||||
that.$set(that, 'notice', res.data.merchant.mer_notice);
|
||||
if (that.description.type == 0) {
|
||||
that.description.content = that.description.content.replace(
|
||||
/<img/gi,
|
||||
|
|
@ -1156,6 +1176,7 @@
|
|||
}, 500);
|
||||
that.DefaultSelect();
|
||||
that.getPricrRule(that.storeInfo.cate_id)
|
||||
// that.getNoticeRule(that.storeInfo.cate_id)
|
||||
that.$nextTick(function() {
|
||||
that.getCouponList();
|
||||
})
|
||||
|
|
@ -1797,6 +1818,10 @@
|
|||
.ml8{
|
||||
top:2rpx
|
||||
}
|
||||
.notice_conter{
|
||||
background-color: #fff;
|
||||
padding: 10rpx;
|
||||
}
|
||||
.discount{
|
||||
display: inline-block;
|
||||
margin-left: 20rpx;
|
||||
|
|
|
|||
|
|
@ -61,6 +61,9 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mack_desc" v-if="refund_type==2">
|
||||
提示: 请5天内上传退货单号，超期此单则无法申请退款。
|
||||
</view>
|
||||
<view class="btn-box" @click="bindComfirm">申请退款</view>
|
||||
<alertBox :msg="msg" v-if="isShowBox" @bindClose="bindClose"></alertBox>
|
||||
</view>
|
||||
|
|
@ -242,6 +245,12 @@
|
|||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.mack_desc{
|
||||
color: red;
|
||||
background: #fff;
|
||||
padding: 20rpx;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
.refund-wrapper{
|
||||
.item{
|
||||
position: relative;
|
||||
|
|
@ -397,7 +406,7 @@
|
|||
.btn-box{
|
||||
width:690rpx;
|
||||
height:86rpx;
|
||||
margin: 70rpx auto;
|
||||
margin: 50rpx auto;
|
||||
line-height: 86rpx;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
<view class="title">
|
||||
恭喜你获得 {{wheel}} 次抽奖机会
|
||||
</view>
|
||||
<LuckyWheel ref="myLucky" width="600rpx" height="600rpx" :blocks="blocks" :prizes="prizes"
|
||||
:buttons="buttons" :defaultStyle="defaultStyle" @start="startCallBack" @end="endCallBack" :defaultConfig="defaultConfig" />
|
||||
<!-- <LuckyWheel ref="myLucky" width="600rpx" height="600rpx" :blocks="blocks" :prizes="prizes"
|
||||
:buttons="buttons" :defaultStyle="defaultStyle" @start="startCallBack" @end="endCallBack" :defaultConfig="defaultConfig" /> -->
|
||||
</view>
|
||||
<view class="lucky-draw-info">
|
||||
<view class="title">
|
||||
|
|
@ -44,11 +44,11 @@
|
|||
|
||||
<script>
|
||||
import {getWhellNumber,getWhellConfig,getWhellAction,getWhellList} from '@/api/user.js'
|
||||
import LuckyWheel from 'uni-luck-draw/lucky-wheel'
|
||||
// import LuckyWheel from 'uni-luck-draw/lucky-wheel'
|
||||
export default {
|
||||
components: {
|
||||
LuckyWheel
|
||||
},
|
||||
// components: {
|
||||
// LuckyWheel
|
||||
// },
|
||||
data() {
|
||||
return {
|
||||
wheel:0,
|
||||
|
|
|
|||
Loading…
Reference in New Issue