Skip to content

M
mayi-mp-shop
Commit 954dee6c by 李嘉林
Options

删除没用代码

parent ad2cba02
Showing with 1 additions and 1204 deletions
src/components/comments/index.vue deleted 100644 → 0
<template>
<!-- 评论模块 -->
<div class="livedIsMsg">
<div class="list">
<scroll-view :style="{'max-height': '24vh','width':'52vw'}" :scroll-y="true" :scroll-top="scrollTop" :scroll-with-animation="true" @scrolltolower="scrolltolower">
<div class="item flex" v-for="(item,index) in commentsList" :key="index">
<div class="user">
<p class="live"></p>
<div class="name">
<span>{{item.customerName}}：</span><span class="test">{{item.guestbookContent}}</span>
</div>
</div>
</div>
</scroll-view>
</div>
</div>
</template>
<script type="text/ecmascript-6">
export default {
name: "",
props:{
id:{
type:Number,
default:0
},
commentsList:{
type:Array,
default:null
},
updateVal:{
type:{
type:Number,
default:0
}
}
},
data() {
return {
list: [],
scrollTop:0,
};
},
watch:{
updateVal(){
this.scrollTop=this.commentsList.length*1000;
}
},
onLoad(){
},
methods: {
scrolltolower(){
},
}
};
</script>
<style lang="scss" scoped>
/* 一行否则出现省略号 */
.line-clamp1 {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.livedIsMsg {
padding: 8px;
margin-bottom: 10px;
position: fixed;
left: 12px;
bottom: 20vh;
.list {
width: 50vw;
overflow: hidden;
bottom: 0;
padding-left: 10px;
border-radius: 9px;
.item {
width: 50vw;
border-radius: 9px;
margin-bottom: 4px;
.user {
max-width: 50vw;
padding: 4px 8px;
display: inline-block;
line-height: 18px;
border-radius: 9px;
background-color: rgba(0,0,0,0.3);
box-sizing: border-box;
.name {
color: #f9a93c;
font-size: 12px;
}
}
.test {
font-size: 12px;
color: #f1f1f1;
word-break: break-all;
}
}
}
}
</style>
src/components/privacyPopup/index.vue deleted 100644 → 0
<template>
<van-popup :show="isShow" round>
<div class="privacy-container">
<div class="privacy-container__header">
<div class="title">隐私保护指引</div>
<div class="content">
在使用当前小程序服务之前，请仔细阅读<span @click="handleDetail">{{ privacyContractName }}</span>。如您同意{{privacyContractName}}，请点击“同意”开始使用。如您拒绝，将无法完整使用所有服务。
</div>
</div>
<div class="privacy-container__bottom van-hairline--top">
<button class="refuse" @click="handleExpose('onRefuse')">拒绝</button>
<button
class="agree"
open-type="agreePrivacyAuthorization"
@agreeprivacyauthorization="handleExpose('onAgree')"
>
同意
</button>
</div>
</div>
</van-popup>
</template>
<script>
export default {
data() {
return {
isShow: false,
privacyContractName: "", // 协议名称
}
},
onLoad() {
this.init();
},
methods: {
init() {
if (wx.getPrivacySetting) {
wx.getPrivacySetting({
success: res => {
if (res.needAuthorization) { // 需要用户授权
this.isShow = res.needAuthorization;
this.privacyContractName = res.privacyContractName;
}
}
})
}
},
// 跳转隐私协议详情
handleDetail() {
wx.openPrivacyContract({
fail: () => wx.showToast({ title: '遇到错误', icon: 'error' }),
});
},
// 暴露事件
handleExpose(type) {
this.isShow = false;
this.$emit(type);
}
},
}
</script>
<style lang="scss" scoped>
.privacy-container {
min-width: 80vw;
background-color: #fff;
&__header {
padding: 30px;
font-size: 17px;
color: #333;
.title {
font-weight: 500;
text-align: center;
}
.content {
line-height: 1.5;
margin-top: 20px;
color: #7f7f7f;
text-align: justify; // 体验增强
span {
color: #1989fa;
}
}
}
&__bottom {
display: flex;
align-items: center;
div, button {
display: flex;
align-items: center;
justify-content: center;
border-radius: 8px;
flex: 1;
margin: 0 15px 20px;
}
button::after {
border: none;
}
.refuse {
background: #f4f4f5;
color: #909399;
}
.agree {
background: #07c160;
color: #fff;
}
}
}
</style>
src/components/product/index.vue deleted 100644 → 0
<template>
<div class="popup-wrap">
<van-popup
:show="productDialogStatus"
position="bottom"
:overlay="true"
@close="close"
custom-style="height:399px;border-top-left-radius: 16px;border-top-right-radius: 16px;z-index:100;"
lock-scoll= "true"
>
<div class="product-title" v-if="productList.length">商品列表({{productList.length}})</div>
<div class="product-list" v-if="productList.length">
<div class="item" v-for="(item,index) in productList" :key="index">
<div class="item-index">{{item.number}}</div>
<div class="item-img">
<image :src="item.productImgUrl" mode="aspectFill" alt=""></image>
</div>
<div class="item-detail">
<div class="product-name text-overflow2">
{{item.productName}}
</div>
<div class="product-bottom">
<div class="product-price">￥{{item.minPrice}}</div>
<div
class="product-do product-up"
@click="setProductStatus(1,item.productId,item)"
v-if="item.upperScreenState == 0 || item.upperScreenState == 2"
>
上屏
</div>
<div
class="product-do product-down"
@click="setProductStatus(0,item.productId,item)"
v-if="item.upperScreenState == 1"
>
下屏
</div>
</div>
</div>
<van-divider customStyle="height:1px;margin:0"></van-divider>
</div>
</div>
<div class="product-no-list" v-else >
暂无商品
</div>
</van-popup>
</div>
</template>
<script>
export default {
props:{
productDialogStatus:{
type:Boolean,
default:false
},
productList:{
type:Array,
default:null
}
},
data(){
return {
list : [],
}
},
watch:{
productList(newVal){
this.productList = newVal
}
},
created(){
},
methods:{
close(){
this.$emit('hideProductPopup',false)
},
setProductStatus(type,id,item,index){
this.$emit('changeProduct',type,id,item)
}
}
}
</script>
<style scoped lang="scss">
.popup-wrap{
position: relative;
z-index: 100;
}
.product-title{
width: 100%;
height: 45px;
line-height: 45px;
font-size: 16px;
color: #333333;
padding-left: 16.5px;
box-sizing: border-box;
}
.product-list{
width: 100%;
height: 350px;
overflow-y: auto;
.item{
display: flex;
justify-content: space-between;
padding: 16px 16.5px;
border-bottom: 1rpx solid #EEEEED;
position: relative;
.item-index{
position: absolute;
width: 19px;
height: 16px;
color: white;
text-align: center;
line-height: 16px;
background-color: #999;
border-top-left-radius: 4px;
border-bottom-right-radius: 4px;
font-size: 12px;
}
.item-img{
width: 90px;
height: 90px;
border-radius:4px;
background-color: #B1B1B1;
margin-right: 16.5px;
overflow: hidden;
image{
width: 100%;
height: 100%;
object-fit: cover;
}
}
.item-detail{
width: 220.5px;
position: relative;
.product-name{
font-size: 15px;
color: #333333;
}
.product-bottom{
width: 100%;
margin-top: 25px;
position: absolute;
bottom: 0;
left: 0;
.product-price{
font-size: 18px;
color: #FF0000;
float: left;
}
.product-do{
width: 64px;
height: 24px;
text-align: center;
line-height: 24px;
border-radius: 12px;
font-size: 15px;
box-sizing: border-box;
float: right;
}
.product-up{
color: white;
background-image:-webkit-linear-gradient(to right,#FF877D, #FB566D);
background-image:-moz-linear-gradient(to right,#FF877D, #FB566D);
background-image:-o-linear-gradient(to right,#FF877D, #FB566D);
background-image: linear-gradient(to right,#FF877D, #FB566D);
}
.product-down{
color: #FF4240;
border: 1px solid #FF4240;
}
}
}
}
}
.product-no-list{
text-align: center;
padding-top: 40px;
line-height: 18px;
color: #999;
}
</style>
\ No newline at end of file
src/components/restaurantList/index.vue deleted 100644 → 0
<template>
<div class="main">
<div class="restaurant-list">
<div class="header_box">
<div class="card_title">餐馆推荐</div>
<div class="see_more">
<span @click="viewMore">查看更多</span>
<i class="iconfont icon-tubiao_jiyao-xiangyou"></i>
</div>
</div>
<div v-if="!isLoading && showList">
<image class="picture" :src="sourceData.restaurantLogo" mode="aspectFill" alt="" />
<div class="title_box">
<div class="title_text">{{ sourceData.restaurantName }}</div>
<div class="title_tag">{{ sourceData.restaurantLabel }}</div>
</div>
<div class="price_box flex">
<div class="count">
<span>承接次数</span>
<span class="price_text">{{ sourceData.receiveCount }}</span>
</div>
<div class="average">
<span>人均</span>
<span class="price_text">￥{{ sourceData.perCapitaConsumption }}</span>
</div>
</div>
<div class="address">
<div><i class="iconfont icon-dingwei2"></i></div>
<div class="address_text">{{ merchantAddress }}</div>
</div>
<div class="btn_box">
<div class="left_btn" @click="linkMerchant">联系商家</div>
<div class="right_btn" @click="orderNow">立即预订</div>
</div>
</div>
<div class="noList" v-else-if="!isLoading">
<image src="http://cdn.mayi888.com/public/jpg/0aac085c-aa79-4ef2-94c8-7bce73f94943.jpg" mode="widthFix" />
<p class="info">当前城市暂无入驻商家，敬请期待</p>
</div>
</div>
</div>
</template>
<script>
const app = getApp()
import goods from "@/api/goods.js"
import { DFSImg } from "@/utils/index";
export default {
name: "restaurant-list",
props: {
datas: {
type: Object,
default: () => {
return {};
}
}
},
data() {
return {
showList: false,
isLoading: true,
sourceData: {
address: "",
restaurantLabel: "",
restaurantLogo: "",
restaurantName: "",
},
}
},
components: {},
computed: {
merchantAddress() {
const {
provinceName = "",
cityName = "",
areaName = "",
address = ""
} = this.sourceData
return provinceName + cityName + areaName + address
}
},
created() {
this.DFSImg = app.DFSImg;
},
onLoad(options) {
// console.log(options,'商家推荐options')
console.log("当前的地址", wx.getStorageSync('location'));
let _this = this
wx.getLocation({
type: 'wgs84',
success: function (res) {
_this.getList(res);
},
fail: function (err) {
_this.isLoading = false;
_this.showList = true;
console.log('定位失败', err)
wx.showModal({
title: '提示',
content: '定位失败，请检查是否开启了定位服务',
success(res) {
if (res.confirm) {
console.log('用户点击确定')
} else if (res.cancel) {
console.log('用户点击取消')
}
_this.getList({
longitude: "",
latitude: ""
});
}
})
}
})
},
methods: {
getList(res) {
let query = {
longitude: res.longitude, // 经度
latitude: res.latitude // 纬度
}
console.log('定位数据', res)
goods.getWlyList(query).then((res) => {
console.log(res,'---res')
this.isLoading = false;
if (res.data.code == 200 && res.data.data) {
this.showList = true;
this.sourceData = res.data.data;
this.sourceData.restaurantLogo = DFSImg(res.data.data.restaurantLogo);
console.log(this.sourceData,DFSImg(res.data.data.restaurantLogo), "商家数据");
} else {
this.showList = false;
}
})
},
viewMore() {
let url = "/pages/wxArticle/main?link=" + encodeURIComponent(process.env.WLY_PROD_MARKETING+"/#/pages/restaurantList/index");
app.$themeToLink({
type: 1.2,
link: url
});
},
linkMerchant() {
wx.makePhoneCall({
phoneNumber: this.sourceData.linkPhone
})
},
orderNow() {
let url = process.env.WLY_PROD_MARKETING + '/#/pages/restaurantInfo/index?restaurantId=' + this.sourceData.id + `${wx.getStorageSync("sessionid") ? `&sessionid=${wx.getStorageSync("sessionid")}` : ''}`
console.log(url, "立即预订的接口地址");
let link = "/pages/wxArticle/main?link=" + encodeURIComponent(url);
app.$themeToLink({
type: 1.2,
link: link
});
},
}
}
</script>
<style lang="scss" scoped>
.main {
overflow: hidden;
box-sizing: border-box !important;
}
.restaurant-list {
// height: 320px;
padding: 12px;
background: #ffffff;
border-radius: 4px;
margin: 10px;
.header_box {
display: flex;
align-items: center;
justify-content: space-between;
}
.noList{
image{
width: 40%;
margin: 20px auto 0;
}
.info{
text-align: center;
color: #999;
font-size: 13px;
margin-bottom: 20px;
}
}
.card_title {
text-align: center;
text-transform: uppercase;
font-size: 18px;
color: #0a0a0a;
font-weight: 600;
}
.see_more {
height: 30px;
color: #999999;
display: flex;
align-items: center;
// margin-bottom: 12px;
.jt {
display: inline-block;
border-top: 1px solid;
border-right: 1px solid;
width: 10px;
height: 10px;
-webkit-transform: rotate(-135deg);
transform: rotate(405deg);
margin-left: 0;
}
}
.picture {
width: 100%;
height: 180px;
margin-top: 12px;
}
.title_box {
display: flex;
// font-weight: 500;
font-size: 18px;
color: #333333;
align-items: center;
margin-top: 12px;
.title_text {
font-weight: 600;
}
.title_tag {
margin-left: 8px;
height: 18px;
font-size: 10px;
line-height: 18px;
border-radius: 2px;
background: #ffe5e7;
color: #e1000f;
text-align: center;
padding: 0 6px;
}
}
.price_box {
margin-top: 6px;
font-size: 12px;
color: #666666;
.count {
margin-right: 12px;
}
.price_text {
margin-left: 6px;
color: #e1000f;
}
}
.address {
margin-top: 12px;
font-size: 14px;
display: flex;
align-items: center;
.address_text {
margin-left: 8px;
}
}
.btn_box {
display: flex;
justify-content: flex-end;
font-size: 16px;
margin-top: 12px;
.left_btn {
padding: 4px 16px;
background: #ffffff;
border-radius: 22px;
color: #e1000f;
border: 1px solid #e1000f;
margin-right: 12px;
}
.right_btn {
padding: 4px 16px;
background: #e1000f;
border-radius: 22px;
color: #ffffff;
border: 1px solid #e1000f;
}
}
}
</style>
src/components/setting/index.vue deleted 100644 → 0
<template>
<div class="setting-wrap">
<div class="set-box">
<div class="set-content" :style="{'bottom':isLive ? '150px' : '190px'}">
<div class="beauty" v-show="active == 1">
<slider
left-icon="cancel"
right-icon="success_no_circle"
min="0"
max="9"
:value="beauty"
activeColor="#FF9900"
block-color="#FF9900"
block-size="24"
@changing="setBeauty"
/>
</div>
<div class="whitening" v-show="active == 2">
<slider
left-icon="cancel"
right-icon="success_no_circle"
min="0"
max="9"
:value="whiteness"
activeColor="#FF9900"
block-color="#FF9900"
block-size="24"
@changing="setWhiteness"
/>
</div>
<div class="clear" v-show="active == 3">
<div class="clear-content">
<div class="clear-item" v-for="(item,index) in clearList" @click="setClear(item)" :key="index">
<div class="clear-item-name" :class="item.id == clearActive ? 'clear-active' :''">{{item.name}}</div>
</div>
</div>
</div>
<div class="equipment-wrap" v-show="active == 4">
<div class="equipment">
<div class="equ-item" v-for="(item,index) in equipmentList" :key="index" @click="equipmentSet(item,index)">
<div class="equ-item-img">
<!-- <img :src="item.imgActive" v-if="item.active" alt=""> -->
<img :src="item.img" alt="">
</div>
<div class="equ-item-name">
{{item.name}}
</div>
</div>
</div>
</div>
</div>
<div class="select-wrap">
<div class="select-list">
<div class="item" v-for="(item,index) in selectList" :key="index" @click="active = item.id">
<div class="item-img">
<img :src="item.img" v-show="item.id != active" alt="">
<img :src="item.activeImg" v-show="item.id == active" alt="">
</div>
<div class="item-name">
{{item.name}}
</div>
</div>
</div>
<div class="start-btn" @click="startLive" v-if="!isLive && liveInfo.liveBroadcastState == 0">
确认开始
</div>
</div>
</div>
</div>
</template>
<script>
export default {
props:{
pusher:{
type:Object,
default:null
},
//美颜
beauty:{
type:Number,
default:0
},
//美白
whiteness:{
type:Number,
default:0
},
//清晰度
clear:{
type:String,
default:'HD'
},
//前置或后置
devicePosition:{
type:String,
default:'front'
},
//麦克风是否开启
enableMic:{
type:Boolean,
default : true
},
//镜像
remoteMirror:{
type:String,
default : 'enable'
},
//是否在直播
isLive:{
type:Boolean,
default:false
},
liveInfo:{
type:Object,
default:null
}
},
data(){
return{
selectList:[
{
id : 1,
name : '美颜',
img : require('../../../static/images/meiyan.png'),
activeImg : require('../../../static/images/meiyan1.png')
},
{
id : 2,
name : '美白',
img : require('../../../static/images/meibai.png'),
activeImg : require('../../../static/images/meibai1.png')
},
{
id : 3,
name : '清晰度',
img : require('../../../static/images/qingxi.png'),
activeImg : require('../../../static/images/qingxi1.png')
},
{
id : 4,
name : '设备',
img : require('../../../static/images/shebei.png'),
activeImg : require('../../../static/images/shebei1.png')
}
],
active : 1,
equipmentList :[
{
id : 1,
name : '反转',
img :require('../../../static/images/xiangji.png'),
imgActive : require('../../../static/images/xiangji1.png'),
active : true,
},
{
id : 2,
name : '镜像',
img :require('../../../static/images/jingxiang.png'),
imgActive : require('../../../static/images/jingxiang1.png'),
active : false,
},
{
id : 3,
name : '声音',
img :require('../../../static/images/shengyin.png'),
imgActive : require('../../../static/images/shengyin1.png'),
active : true,
}
],
clearList:[
{
id : 1,
name : '标清',
val : 'SD'
},
{
id : 2,
name : '高清',
val : 'HD'
},
{
id : 3,
name : '超清',
val : 'FHD'
}
],
clearActive:2,
}
},
methods:{
setBeauty(e){
this.$emit('updateBeauty',e.mp.detail.value)
},
setWhiteness(e){
this.$emit('updateWhiteness',e.mp.detail.value)
},
setClear(item){
this.clearActive = item.id;
this.$emit('updateClear',item.val)
},
equipmentSet(item,index){
//反转
if(item.id == 1){
this.pusher.switchCamera({
success : (res) => {
if(res.errMsg == 'operateXWebLivePusher:ok'){
this.$set(this.equipmentList[index],'active',!item.active)
}
}
})
}else if(item.id == 2){
this.$set(this.equipmentList[index],'active',!item.active)
this.$emit('updateRemoteMirror',this.remoteMirror == 'disable' ? 'enable' : 'disable')
}else if(item.id == 3){
this.$set(this.equipmentList[index],'active',!item.active)
this.$emit('updateEnableMic',this.enableMic == true ? false : true)
}
},
//开始直播
startLive(){
this.$emit('setBeautyStart','start')
}
}
}
</script>
<style lang="scss" scoped>
.set-content{
width: 289px;
position: fixed;
left: 50%;
margin-bottom: 60px;
margin-left: -149px;
.beauty,.whitening{
padding: 0 18px;
box-sizing: border-box;
}
.clear{
.clear-content{
display: flex;
justify-content:space-between;
.clear-item{
display: flex;
align-items: flex-end;
.clear-item-name{
font-size: 19px;
color: white;
}
.clear-active{
font-size: 30px;
position: relative;
&::after{
content: "";
position: absolute;
width: 7px;
height: 7px;
background-color: #FF9900;
border-radius: 50%;
bottom: -12px;
left: 50%;
margin-left: -3.5px;
}
}
}
}
}
.equipment-wrap{
.equipment{
display: flex;
justify-content: space-around;
align-items: center;
.equ-item{
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
&:nth-child(1){
.equ-item-img{
width: 26.5px;
height: 21px;
}
}
&:nth-child(2){
.equ-item-img{
width: 27px;
height: 24.5px;
}
}
&:nth-child(3){
.equ-item-img{
width: 25px;
height: 21.5px;
}
}
&:nth-child(4){
.equ-item-img{
width: 24.5px;
height: 24px;
}
}
.equ-item-img{
img{
width: 100%;
height: 100%;
}
}
.equ-item-name{
font-size: 12px;
color: white;
margin-top: 13px;
}
.name-active{
color: #FF9900;
}
}
}
}
}
.select-wrap{
width: 289px;
// height: 265px;
padding-bottom: 15px;
background-color: rgba(0,0,0,.5);
border-radius: 5px;
position: fixed;
bottom: 82px;
left: 50%;
margin-left: -145.5px;
box-sizing: border-box;
.select-list{
display: flex;
justify-content: space-around;
align-items: center;
padding-top: 13px;
.item{
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
&:nth-child(1){
.item-img{
width: 28px;
height:27px;
}
}
&:nth-child(2){
.item-img{
width: 23px;
height: 30px;
}
}
&:nth-child(3){
.item-img{
width:30px;
height: 30px;
}
}
&:nth-child(4){
.item-img{
width: 29px;
height: 29px;
}
}
.item-img{
img{
width: 100%;
height: 100%;
}
}
.item-name{
font-size: 12px;
color: white;
margin-top: 10px;
}
}
}
.start-btn{
width: 144px;
height: 39.5px;
text-align: center;
line-height: 39.5px;
font-size: 18px;
color: white;
border-radius: 5px;
margin: 10px auto 0;
background-image:-webkit-linear-gradient(to right,#FF877D, #FB566D);
background-image:-moz-linear-gradient(to right,#FF877D, #FB566D);
background-image:-o-linear-gradient(to right,#FF877D, #FB566D);
background-image: linear-gradient(to right,#FF877D, #FB566D);
}
}
</style>
\ No newline at end of file
src/main.js
...@@ -250,20 +250,3 @@ wx.onAppRoute(res => { ...@@ -250,20 +250,3 @@ wx.onAppRoute(res => {
mpBehavior.trackPageView(trackPageViewQuery); mpBehavior.trackPageView(trackPageViewQuery);
}) })
}) })
// if (!mpApp.globalData.setPopupStorage){
// let popUpList = wx.getStorageSync('popUpList') || []
// let arr = []
// popUpList.forEach(item=> {
// arr.push(item)
// wx.removeStorageSync(item)
// })
// arr.forEach(item => {
// popUpList.splice(popUpList.indexOf(item),1)
// })
// wx.setStorageSync('popUpList', popUpList)
// }
src/pages/home/index.vue
...@@ -167,7 +167,6 @@ import bottomCont from "../../components/bottomCont" ...@@ -167,7 +167,6 @@ import bottomCont from "../../components/bottomCont"
import ThemeDataPlant from "../../components/ThemeDataPlant" import ThemeDataPlant from "../../components/ThemeDataPlant"
import links from '@/components/basicTool/link/index.vue' import links from '@/components/basicTool/link/index.vue'
import interval from '@/components/basicTool/interval/index.vue' import interval from '@/components/basicTool/interval/index.vue'
import restaurantList from '../../components/restaurantList'
import partition from '@/components/basicTool/partition/index.vue' import partition from '@/components/basicTool/partition/index.vue'
import shopPopup from '@/components/basicTool/shop-popup/index.vue' import shopPopup from '@/components/basicTool/shop-popup/index.vue'
import woTimeout from '@/components/basicTool/wo-timeout/index.vue' import woTimeout from '@/components/basicTool/wo-timeout/index.vue'
...@@ -242,7 +241,6 @@ export default { ...@@ -242,7 +241,6 @@ export default {
}; };
}, },
components:{ components:{
"restaurant-list":restaurantList,
links, links,
interval, interval,
partition, partition,
......
src/pages/index/index.vue
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
// url添加门店信息参数 // url添加门店信息参数
let { offlineShopCode, offlineShopName } = getStoreInfo(); let { offlineShopCode, offlineShopName } = getStoreInfo();
console.log(offlineShopCode,'----index-offlineShopCode') console.log(offlineShopCode,'----index-offlineShopCode')
if (offlineShopCode && this.params.includes("offlineShopCode") == -1) { if (offlineShopCode && !this.params.includes("offlineShopCode")) {
this.params+=`&offlineShopCode=${offlineShopCode}&offlineShopName=${offlineShopName}` this.params+=`&offlineShopCode=${offlineShopCode}&offlineShopName=${offlineShopName}`
} }
// 定位信息 // 定位信息
...@@ -408,18 +408,6 @@ export default { ...@@ -408,18 +408,6 @@ export default {
//商品详情 pid_123 //商品详情 pid_123
this.page = `/goods/${querys[1]}`; this.page = `/goods/${querys[1]}`;
this.params += this.paramsHander(querys,3)+`&discountMargin=${querys[querys.length-1]}` this.params += this.paramsHander(querys,3)+`&discountMargin=${querys[querys.length-1]}`
// if(querys.length > 3){
// if(querys[5]){
// this.params += `&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}&userId=${querys[5]}`
// }else{
// this.params += `&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}`
// }
// }else if(querys.length == 3){
// this.params += `&userId=${querys[2]}`
// }
} else if (querys[0] == "activty") { } else if (querys[0] == "activty") {
//活动页面activty_turntable_123 //活动页面activty_turntable_123
this.params += `&pageInfo=${scene}`; this.params += `&pageInfo=${scene}`;
...@@ -427,30 +415,9 @@ export default { ...@@ -427,30 +415,9 @@ export default {
//分销员 小程序码 //分销员 小程序码
this.page = `/personalCenter/spokesmanCenter`; this.page = `/personalCenter/spokesmanCenter`;
this.params += this.paramsHander(querys,2) this.params += this.paramsHander(querys,2)
// if(querys.length > 2){
// if(querys[4]){
// this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}&userId=${querys[4]}`
// }else{
// this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}`
// }
// }else if(querys.length == 2){
// this.params += `&userId=${querys[1]}`
// }
}else if(querys[0] == "home"){ }else if(querys[0] == "home"){
this.page = `/`; this.page = `/`;
this.params += this.paramsHander(querys,2) this.params += this.paramsHander(querys,2)
// if(querys.length > 2){
// if(querys[4]){
// this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}&userId=${querys[4]}`
// }else{
// this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}`
// }
// }else if(querys.length == 2){
// this.params += `&userId=${querys[1]}`
// }
}else if(querys[0] == "coupon"){ }else if(querys[0] == "coupon"){
this.page = `/personalCenter/coupon/getCoupon`; this.page = `/personalCenter/coupon/getCoupon`;
this.params+=`&couponId=${querys[1]}` this.params+=`&couponId=${querys[1]}`
...@@ -458,16 +425,6 @@ export default { ...@@ -458,16 +425,6 @@ export default {
this.page = "/activty/receivingGift" this.page = "/activty/receivingGift"
this.params += `&orderId=${querys[1]}` this.params += `&orderId=${querys[1]}`
this.params += this.paramsHander(querys,3) this.params += this.paramsHander(querys,3)
// if(querys.length > 3){
// if(querys[5]){
// this.params += `&orderSn=${querys[1]}&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}&userId=${querys[5]}`
// }else{
// this.params += `&orderSn=${querys[1]}&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}`
// }
// }else if(querys.length == 3){
// this.params += `&orderSn=${querys[1]}&userId=${querys[2]}`
// }
}else if (querys[0] == 'redeemCode') {//兑换码 }else if (querys[0] == 'redeemCode') {//兑换码
this.page = `/personalCenter/CDkey/exchange`; this.page = `/personalCenter/CDkey/exchange`;
}else if(querys[0] == 'card'){ }else if(querys[0] == 'card'){
......
src/pages/login/index.vue
...@@ -82,8 +82,6 @@ ...@@ -82,8 +82,6 @@
<!-- 选择企业 --> <!-- 选择企业 -->
<SelectEnterpriseAccount ref="SelectEnterpriseAccount" @confirm="getEnterpriseAccount"></SelectEnterpriseAccount> <SelectEnterpriseAccount ref="SelectEnterpriseAccount" @confirm="getEnterpriseAccount"></SelectEnterpriseAccount>
<ProtocolDialog v-model="isShowProtocol" :index="currentIndex" :isShowReadTime="isShowReadTime" :protocolList="[userAgreement, privacyPolicy].filter(Boolean)" @onAgree="handleAgree" /> <ProtocolDialog v-model="isShowProtocol" :index="currentIndex" :isShowReadTime="isShowReadTime" :protocolList="[userAgreement, privacyPolicy].filter(Boolean)" @onAgree="handleAgree" />
<!-- 隐私弹窗 -->
<!-- <PrivacyPopup @onAgree="handleAgree" @onRefuse="back" /> -->
</div> </div>
</template> </template>
...@@ -104,7 +102,6 @@ import text from '@/components/content/text' ...@@ -104,7 +102,6 @@ import text from '@/components/content/text'
import richText from "../../components/basicTool/rich-text"; import richText from "../../components/basicTool/rich-text";
import interval from '@/components/basicTool/interval/index.vue' import interval from '@/components/basicTool/interval/index.vue'
import partition from '@/components/basicTool/partition/index.vue' import partition from '@/components/basicTool/partition/index.vue'
import PrivacyPopup from '@/components/privacyPopup'
import SelectEnterpriseAccount from "@/components/common/SelectEnterpriseAccount" import SelectEnterpriseAccount from "@/components/common/SelectEnterpriseAccount"
const app = getApp(); const app = getApp();
const { log } = app; const { log } = app;
...@@ -839,11 +836,6 @@ export default { ...@@ -839,11 +836,6 @@ export default {
backMainHandle() { backMainHandle() {
// 跳转回小程序页面 // 跳转回小程序页面
this.pushPageType(); this.pushPageType();
// wx.reLaunch({
// url: `../index/main?from=login&backpath=${
// this.backPath
// }&params=${encodeURIComponent(this.backParams)}`
// });
}, },
eLogin() { eLogin() {
//企业员工登录 //企业员工登录
......
src/pages/userInfo/index.vue
...@@ -286,25 +286,10 @@ export default { ...@@ -286,25 +286,10 @@ export default {
} }
}); });
}, },
// onRead(file) {
// console.log(file)
// this.uploadImg = file.content;
// let uploadImgReq = this.uploadImg
// common.getUploadImg({uploadImgReq:uploadImgReq}).then(res => {
// console.log(res);
// })
// },
chooseSex(value) { chooseSex(value) {
console.log(value, "------------------264"); console.log(value, "------------------264");
let val = value.mp.detail.index; let val = value.mp.detail.index;
this.userMsg.gender = val; this.userMsg.gender = val;
// if (val == "女") {
// } else if (val == "男") {
// this.userMsg.gender = 1;
// } else {
// this.userMsg.gender = 2;
// }
this.sex_show = false; this.sex_show = false;
}, },
chooseSexCancel() { chooseSexCancel() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment