mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-10-03 02:36:39 +08:00
Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3
This commit is contained in:
Carl
commit
67adc6cd85
@ -88,6 +88,9 @@
|
||||
font-style: normal;
|
||||
font-size: 14px;
|
||||
color: #e1001a;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis
|
||||
}
|
||||
.rc-userfont {
|
||||
overflow: hidden;
|
||||
@ -254,6 +257,9 @@ margin-top: 30px;
|
||||
font-style: normal;
|
||||
font-size: 16px;
|
||||
color: #e1001a;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis
|
||||
}
|
||||
.rc-userfont {
|
||||
overflow: hidden;
|
||||
|
||||
@ -62,15 +62,15 @@ input[type=checkbox]{
|
||||
border:none;
|
||||
//border: 1px solid #d7d7d7;
|
||||
border-radius: 3px;
|
||||
width: 1.5rem;
|
||||
height: 1.5rem;
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
-webkit-appearance:none;
|
||||
&:before {
|
||||
top: 0;
|
||||
left: 0;
|
||||
content: "";
|
||||
width: 1.5rem;
|
||||
height: 1.5rem;
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
position: absolute;
|
||||
display: inline-block;
|
||||
background-color: #fff;
|
||||
@ -83,7 +83,7 @@ input[type=checkbox]{
|
||||
}
|
||||
label {
|
||||
input[type=checkbox] {
|
||||
top:.375rem;
|
||||
// top:.375rem;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
}
|
||||
.usecheck label{
|
||||
display:flex;
|
||||
align-items: center;
|
||||
input{
|
||||
margin-right:.687rem;
|
||||
}
|
||||
@ -48,10 +49,10 @@
|
||||
.usecheck{
|
||||
display: flex;
|
||||
text-align: left;
|
||||
width: 335px;
|
||||
margin: 0 auto;
|
||||
align-items: center;
|
||||
margin-top: 18px;
|
||||
border-bottom: 1px solid #d7d7d7;
|
||||
|
||||
}
|
||||
.container {
|
||||
@ -106,6 +107,20 @@
|
||||
border: none;
|
||||
outline: none;
|
||||
}
|
||||
.rc-one-column {
|
||||
font-size: 12px;
|
||||
strong{
|
||||
font-size: 12px;
|
||||
margin-left: 6px;
|
||||
font-weight: bold;
|
||||
}
|
||||
i{
|
||||
font-style: normal;
|
||||
color: #E1001A;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
}
|
||||
.rc-center {
|
||||
font-size: 30px;
|
||||
color: #333333;
|
||||
@ -142,14 +157,50 @@
|
||||
}
|
||||
// /* 最小768px最大1920 *pc端/
|
||||
@media screen and (min-width: 769px) {
|
||||
.rc-one-column{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
.rc-one-column {
|
||||
font-size: 12px;
|
||||
.rc-text--left{
|
||||
strong{
|
||||
font-size: 12px;
|
||||
margin-left: 6px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
i{
|
||||
font-style: normal;
|
||||
color: #E1001A;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
.usecheck{
|
||||
display: flex;
|
||||
text-align: left;
|
||||
width: 395px;
|
||||
margin: 0 auto;
|
||||
align-items: center;
|
||||
margin-top: 18px;
|
||||
|
||||
border-bottom: 1px solid #d7d7d7
|
||||
}
|
||||
.usecheck label{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
i{
|
||||
font-style: normal;
|
||||
color: #E1001A;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
.rc-one-column strong{
|
||||
font-size: 12px;
|
||||
margin-left: 6px;
|
||||
font-weight: bold;
|
||||
}
|
||||
/deep/
|
||||
.van-field-one{
|
||||
|
||||
@ -22019,9 +22019,6 @@ li:last-child .edge .rc-tab--view-control:focus,li:last-child
|
||||
}
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
.rc-xl-up,.xl-up {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.rc-flex-direction--reverse--xl-down {
|
||||
-webkit-box-orient: vertical;
|
||||
|
||||
@ -56,6 +56,8 @@
|
||||
</span>
|
||||
</button>
|
||||
-->
|
||||
|
||||
|
||||
<button data-js-trigger="search-bar" @click='searchturn' evt-name='页内弹窗' evt-cat='headerBtnClick' evt-val='全文搜索' class="rc-btn rc-btn--icon rc-icon rc-search--xs rc-iconography rc-interactive" aria-label="Search" role="menuitem" data-click-modifier=".rc-hidden">
|
||||
<span class="rc-screen-reader-text">translations.feature.headerbar.search</span>
|
||||
</button>
|
||||
|
||||
@ -2,4 +2,13 @@
|
||||
module.exports={
|
||||
//图片路径地址
|
||||
rbs:'http://47.96.75.242:10086/royalcanin/',
|
||||
//成猫肝脏全价处方量
|
||||
hotcat:'https://detail.tmall.com/item.htm?spm=a1z10.3-b-s.w4011-22642828081.211.262fb910fpPRF5&id=614604022166&rn=5eba1d0b816544b39888beddbf21d03a&abbucket=19&skuId=4624275223532',
|
||||
//成猫优纤易消化全价处方粮
|
||||
hotcat1:"https://detail.tmall.com/item.htm?spm=a1z10.3-b-s.w4011-22642828081.75.6070b910aVqaCe&id=614817599199&rn=7413968dc827a6cae94ffaf684c78384&abbucket=19&skuId=4798969553513",
|
||||
|
||||
//成猫肠道全价处方粮（适中能量）
|
||||
hotcat2:'https://detail.tmall.com/item.htm?spm=a1z10.3-b-s.w4011-22642828081.150.6070b910aVqaCe&id=620738193181&rn=7413968dc827a6cae94ffaf684c78384&abbucket=19&skuId=4938650051548',
|
||||
//成猫肠道全价处方粮
|
||||
hotcat3:'https://detail.tmall.com/item.htm?spm=a1z10.3-b-s.w4011-22642828081.51.6070b910aVqaCe&id=618722103730&rn=7413968dc827a6cae94ffaf684c78384&abbucket=19&skuId=4910398135159',
|
||||
}
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
<!-- <h2>明星猫粮</h2> -->
|
||||
<div class="pageFullScreen" id="xxxFullScreen" v-show="catproduct" ref="mingxing">
|
||||
<!-- 内容 -->
|
||||
<div class="rc-full-width rc-padding-y--md" id="swiper1">
|
||||
<div class="rc-full-width rc-padding-y--md" id="swiper1" :style="usermargin" >
|
||||
<h2 class="rc-beta rc-text--center">{{usertitle}}</h2>
|
||||
<!-- 轮播图 -->
|
||||
<div class="ts-carousel-container">
|
||||
@ -752,6 +752,7 @@
|
||||
return{
|
||||
fixedHeader:false,
|
||||
dataLoaded:true,
|
||||
usermargin:{marginTop: '0'},
|
||||
useraindex:0,
|
||||
mobileVideoPlaying:false,
|
||||
usertitle:'明星猫粮',
|
||||
@ -760,6 +761,7 @@
|
||||
catshi:[],
|
||||
userindex:0,
|
||||
userstype:'',
|
||||
usertop:true,
|
||||
onemao:false,
|
||||
twomao:false,
|
||||
threemao:false,
|
||||
@ -1204,10 +1206,13 @@
|
||||
var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
|
||||
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
|
||||
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
|
||||
//console.log("当前是电脑打开")
|
||||
console.log("当前是电脑打开")
|
||||
this.stypechange=false;
|
||||
//console.log(this.usertitle)
|
||||
|
||||
this.usermargin={
|
||||
marginTop:'0',
|
||||
}
|
||||
this.usertop=false,
|
||||
this.catproduct=true;
|
||||
this.onemao=false;
|
||||
this.twomao=false;
|
||||
@ -1220,12 +1225,13 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
//console.log("当前是手机打开")
|
||||
console.log("当前是手机打开")
|
||||
this.showingBanners=this.banners.mobile;
|
||||
this.stypechange=true;
|
||||
this.onemao=true;
|
||||
this.twomao=true;
|
||||
this.threemao=true;
|
||||
this.usertop=true,
|
||||
this.fourmao=true;
|
||||
this.fivemao=true;
|
||||
this.dogshow=true;
|
||||
@ -1461,6 +1467,7 @@
|
||||
this.fixedHeader=false;
|
||||
this.gotop = true
|
||||
this.searchBar=false
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1468,6 +1475,14 @@
|
||||
this.gotop = false;
|
||||
this.searchBar=true
|
||||
}
|
||||
console.log(this.searchBar);
|
||||
if(this.searchBar==false && this.usertop==true){
|
||||
this.usermargin={marginTop: '270px'};
|
||||
}else{
|
||||
this.usermargin={marginTop: '0px'};
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
async courseId(item) {
|
||||
this.dataLoaded=false;
|
||||
|
||||
@ -65,7 +65,7 @@
|
||||
<div class="line_dashed"></div>
|
||||
<div class="userer">
|
||||
<div class="qrcode">
|
||||
<img src="/images/qrcode-aichong.jpg">
|
||||
<img src="/images/paysucess.jpg">
|
||||
</div>
|
||||
<p>微信扫一扫，识别二维码</p>
|
||||
<p class="tips">加入社群0元试用商品随单发放</p>
|
||||
|
||||
@ -106,7 +106,13 @@
|
||||
<div class="rc-productdetail" v-if="!userbuy">
|
||||
<i class="ts-row-title">所属分类：</i>
|
||||
<span>{{ curItem.categoryName }}</span>
|
||||
|
||||
</div>
|
||||
<div class="rc-button ">
|
||||
<span @click="chuafangbuy()">立即购买</span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="rc-productdetail" v-if="userbuy">
|
||||
<i class="ts-row-title">商品价格：</i>
|
||||
<span class="ts-realprice">￥{{ curItem.ecPrice }}</span>
|
||||
@ -196,6 +202,7 @@
|
||||
<span @click="usertanchu(curItem, 0)">加入购物车</span>
|
||||
<span @click="usertanchu(curItem, 1)">立即购买</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="online bold rc-md-down"></div>
|
||||
</div>
|
||||
@ -207,6 +214,7 @@
|
||||
</div>
|
||||
<FixRight></FixRight>
|
||||
<Myfooter v-on:litentop="showmesg"></Myfooter>
|
||||
|
||||
</div>
|
||||
<el-dialog :visible.sync="dialogInfo1" @close="userclose" class="pop_coupon" :close-on-click-modal="false">
|
||||
<div class="ts-no-data" v-if="usernewlist.length<=0">目前还没有可用的优惠券</div>
|
||||
@ -266,6 +274,8 @@
|
||||
<span @click="usertanchu(curItem, 0)">加入购物车</span>
|
||||
<span @click="usertanchu(curItem, 1)">立即购买</span>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -275,6 +285,8 @@ import tabs from "@/components/tabs.vue";
|
||||
import FixRight from "~/components/fixed-right.vue";
|
||||
import unlogin from "~/components/unlogin.vue";
|
||||
import Myfooter from "~/components/rc-footer.vue";
|
||||
import { mapMutations } from "vuex";
|
||||
const settings = require("@/config");
|
||||
import {
|
||||
goodsmessage,
|
||||
getConfig,
|
||||
@ -284,14 +296,14 @@ import {
|
||||
oncequery,
|
||||
biaomessage
|
||||
} from "../../ajax/getData";
|
||||
import { mapMutations } from "vuex";
|
||||
const settings = require("@/config");
|
||||
|
||||
export default {
|
||||
async asyncData (context) {
|
||||
let isRxGoods = context.route.query.isRxGoods;
|
||||
let userbuy = true;
|
||||
let newlist = [];
|
||||
let curItem = {};
|
||||
let chufang = {};
|
||||
let productAttachmentList = [];
|
||||
let userlistmenu = [];
|
||||
isRxGoods = (isRxGoods == '1'?true:false);
|
||||
@ -306,6 +318,8 @@ export default {
|
||||
let data = await oncequery(mainProductCode);
|
||||
let outputObj = {};
|
||||
if (data) {
|
||||
console.log(data);
|
||||
chufang=data;
|
||||
outputObj = data;
|
||||
outputObj.productName = data.name;
|
||||
outputObj.picture = 'https://royalcanincn.escase.cn/jc/royalcanin/'+outputObj.picture;
|
||||
@ -316,6 +330,9 @@ export default {
|
||||
let insertTmpObj = {id:1, attachmentType:1, sort:1, attachmentPath:newlist[0].picture};
|
||||
productAttachmentList = [insertTmpObj];
|
||||
userbuy = false;
|
||||
console.log('这是处方量数据')
|
||||
|
||||
|
||||
} else {
|
||||
let stopLeftAllotmentChecking = false;
|
||||
let stopIndex = 0;
|
||||
@ -352,14 +369,12 @@ export default {
|
||||
activeIndexa,
|
||||
curItem,
|
||||
newlist,
|
||||
chufang,
|
||||
productAttachmentList,
|
||||
userbuy
|
||||
}
|
||||
},
|
||||
// middleware: 'metaTitle',
|
||||
// // middleware: 'metaTitle',
|
||||
// meta: {title: '产品详情'},
|
||||
data() {
|
||||
data() {
|
||||
return {
|
||||
tableLabelTest: [],
|
||||
userimage: require("../../assets/image/unused.png"),
|
||||
@ -378,6 +393,7 @@ export default {
|
||||
productlist: [],
|
||||
userbuy: true,
|
||||
sales_num: 1,
|
||||
|
||||
productAttachmentList: [],
|
||||
usernewlist: [
|
||||
{
|
||||
@ -427,6 +443,10 @@ export default {
|
||||
Myfooter,
|
||||
FixRight
|
||||
},
|
||||
// middleware: 'metaTitle',
|
||||
// // middleware: 'metaTitle',
|
||||
// meta: {title: '产品详情'},
|
||||
|
||||
mounted() {
|
||||
this.checkIsLogin();
|
||||
if (this.usermessage !== "" || this.usermessage.data !== undefined) {
|
||||
@ -472,6 +492,10 @@ export default {
|
||||
});
|
||||
}
|
||||
},
|
||||
//处方用粮跳转
|
||||
chuafangbuy(){
|
||||
window.location.href =this.chufang.goodUrl;
|
||||
},
|
||||
|
||||
// changeName(newName){
|
||||
// this.name = newName;
|
||||
|
||||
@ -75,14 +75,40 @@
|
||||
<label>
|
||||
<input
|
||||
type="checkbox"
|
||||
@click="checkBox()"
|
||||
style="width: 24px; height: 24px"
|
||||
@click="checkBox($event,2)"
|
||||
v-model="inRank"
|
||||
/>我已阅读同意隐私声明和账号使用协议
|
||||
/>
|
||||
<strong>本人已年满16周岁,同意并接受公司按<a href="https://royalcanin.com.cn/privacy"><i>《隐私政策》</i></a>及<a href="https://royalcanin.com.cn/declaration"><i>《法律声明》</i></a>的规定收集和处理我的个人信息。
|
||||
您可以就隐私问题通过隐私政策中的方式联系我们并行使您的个人信息权利。</strong>
|
||||
</label>
|
||||
</div>
|
||||
<div class="usecheck rc-column rc-text--left">
|
||||
<label>
|
||||
<input
|
||||
type="checkbox"
|
||||
@click="checkBox($event,3)"
|
||||
v-model="inRanka"
|
||||
/>
|
||||
<strong>
|
||||
我已阅读和了解皇家爱宠荟的<a href="https://royalcanin.com.cn/member-principle"><i>《会员规则》</i></a>并同意接受其中所有的条框。</strong>
|
||||
</label>
|
||||
</div>
|
||||
<div class="usecheck rc-column rc-text--left">
|
||||
<label>
|
||||
<input
|
||||
type="checkbox"
|
||||
@click="checkBox($event,1)"
|
||||
v-model="allcheck"
|
||||
/>
|
||||
<i>
|
||||
一键勾选
|
||||
</i>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="rc-layout-container rc-two-column rc-button">
|
||||
<!-- <div class="rc-layout-container rc-two-column rc-button">
|
||||
<div class="rc-column rc-text--left">
|
||||
<a href="https://royalcanin.com.cn/privacy" target="_blank" class="rc-styled-link"><span>隐私政策</span></a>
|
||||
</div>
|
||||
@ -91,7 +117,7 @@
|
||||
<span>注册账户</span>
|
||||
</nuxt-link>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="rc-layout-container rc-one-column">
|
||||
<div class="rc-column">
|
||||
@ -126,8 +152,14 @@ export default {
|
||||
layerMSg: "手机格式不对",
|
||||
tel: "",
|
||||
password: "",
|
||||
allcheck:false,
|
||||
activeIndex: 0,
|
||||
tamp:'',
|
||||
radioData: [
|
||||
{ value: '全部' ,href:'https://royalcanin.com.cn/privacy' },
|
||||
{ value: '部分' ,href:''},
|
||||
{ value: '零散' }
|
||||
],
|
||||
hash:'',
|
||||
text: "",
|
||||
sms: "",
|
||||
@ -141,6 +173,7 @@ export default {
|
||||
ifpassword: false,
|
||||
checked: false,
|
||||
inRank: false,
|
||||
inRanka: false,
|
||||
usercheckbox:false,
|
||||
|
||||
swiperData: [
|
||||
@ -188,13 +221,20 @@ export default {
|
||||
// console.log(this.inRank);
|
||||
// },
|
||||
methods: {
|
||||
//全选
|
||||
checkBoxa(e,order){
|
||||
let checked=e.target.checked;
|
||||
console.log(checked)
|
||||
|
||||
...mapMutations(["changeClod"]),
|
||||
checkBox(){
|
||||
console.log(event.target.checked)
|
||||
this.usercheckbox=event.target.checked
|
||||
},
|
||||
|
||||
checkBox(e,order){
|
||||
console.log(e.target.checked)
|
||||
this.usercheckbox=e.target.checked;
|
||||
this.inRank= this.usercheckbox;
|
||||
|
||||
},
|
||||
...mapMutations(["changeClod"]),
|
||||
//获取验证码
|
||||
async usermsg() {
|
||||
//console.log("-----");
|
||||
|
||||
BIN
rc-busness/static/images/paysucess.jpg
Normal file
BIN
rc-busness/static/images/paysucess.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 60 KiB |
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user