修改文字
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view>
|
||||
<view class="basics-content">
|
||||
<view class="coupons-preview">
|
||||
<view class="item cover">
|
||||
<view v-if="types[typeIndex].id == 2">
|
||||
@@ -89,7 +89,7 @@
|
||||
</view>
|
||||
<view class="inputs">
|
||||
<label class="input-label">关联商品</label>
|
||||
<view class="input-text" @click="onSelectGoods">
|
||||
<view class="input-text" @click="onSelectGoods" v-if="coupongoods">
|
||||
<block v-if="coupongoods.length > 0">已关联{{coupongoods.length}}件商品</block>
|
||||
<block v-else>选择关联商品</block>
|
||||
<uni-icons class="picker-icon" type="arrowdown" size="14" />
|
||||
@@ -100,9 +100,9 @@
|
||||
<label>使用规则</label>
|
||||
<textarea :maxlength="-1" v-model="description" placeholder="输入使用规则说明" />
|
||||
</view>
|
||||
<view class="add-btn ios-bottom">
|
||||
<button type="default" @click="updComponent">发布优惠券</button>
|
||||
</view>
|
||||
<view class="basisc-btn">
|
||||
<button type="default" class="btn" @click="updComponent">发布优惠券</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -234,7 +234,36 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
<style lang="scss" scoped>
|
||||
.basics-content{
|
||||
padding-bottom: ($padding*3) + 90;
|
||||
}
|
||||
|
||||
// 按钮组
|
||||
.basisc-btn{
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
padding: $padding;
|
||||
background: white;
|
||||
box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
|
||||
.btn {
|
||||
background: $mian-color;
|
||||
color: white;
|
||||
border-radius: 0;
|
||||
font-size: $title-size-lg;
|
||||
line-height: 88rpx;
|
||||
height: 88rpx;
|
||||
&::after {
|
||||
border: none;
|
||||
}
|
||||
&[disabled] {
|
||||
background: rgba($color: $mian-color, $alpha: .6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.add-btn{
|
||||
padding: $padding;
|
||||
button{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view>
|
||||
<view class="basics-content">
|
||||
<view class="header">
|
||||
<view class="tabs">
|
||||
<view class="item" :class="{'show': listType == ''}" @click="onTabs('')">全部</view>
|
||||
@@ -102,6 +102,10 @@
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.basics-content{
|
||||
padding-bottom: ($padding*3) + 90;
|
||||
}
|
||||
|
||||
// 按钮组
|
||||
.basisc-btn{
|
||||
position: fixed;
|
||||
|
||||
@@ -56,9 +56,9 @@
|
||||
</checkbox-group>
|
||||
</view>
|
||||
<!-- 按钮 -->
|
||||
<view class="add-btns">
|
||||
<button size="default" @click="onAddEmployees">{{type === 'PUT' ? '修改': '添加'}}</button>
|
||||
</view>
|
||||
<view class="basisc-btn">
|
||||
<button class="btn" size="default" @click="onAddEmployees">{{type === 'PUT' ? '修改': '添加'}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -191,8 +191,34 @@
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
// 按钮组
|
||||
.basisc-btn{
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
padding: $padding;
|
||||
background: white;
|
||||
box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
|
||||
.btn {
|
||||
background: $mian-color;
|
||||
color: white;
|
||||
border-radius: 0;
|
||||
font-size: $title-size-lg;
|
||||
line-height: 88rpx;
|
||||
height: 88rpx;
|
||||
&::after {
|
||||
border: none;
|
||||
}
|
||||
&[disabled] {
|
||||
background: rgba($color: $mian-color, $alpha: .6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content{
|
||||
min-height: 100vh;
|
||||
// min-height: 100vh;
|
||||
padding-bottom: ($padding*3) + 90;
|
||||
@extend .ios-bottom;
|
||||
.title{
|
||||
padding: ($padding/2) $padding;
|
||||
|
||||
@@ -72,16 +72,16 @@
|
||||
</view>
|
||||
<!-- 商品详情介绍 -->
|
||||
<view class="form-block">
|
||||
<view class="form-box picker-flex">
|
||||
<!-- <view class="form-box picker-flex">
|
||||
<label class="form-label">支持易货</label>
|
||||
<view class="picker-switch">
|
||||
<switch :checked="isChange" color="#e93340" @change="pickerChange($event, 'isChange')"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="form-box inputs-flex" v-if="isChange">
|
||||
</view> -->
|
||||
<!-- <view class="form-box inputs-flex" v-if="isChange">
|
||||
<label class="form-label">最低易货量</label>
|
||||
<input type="number" v-model="skus_number" placeholder="输入最低易货量"/>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="form-box inputs-flex">
|
||||
<label class="form-label">发行权证数</label>
|
||||
<input type="number" v-model="skus_stock" placeholder="输入商品发行权证数"/>
|
||||
@@ -398,13 +398,14 @@
|
||||
content : this.$Route.query.type === 'edit' ? '商品权证已更新,是否立即补充产品附加信息认证?' : '商品权证已发布,是否立即补充产品附加信息认证?',
|
||||
cancelText : '稍后认证',
|
||||
confirmText : '立即认证',
|
||||
success : res => {
|
||||
if(res.cancel){
|
||||
success : authRes => {
|
||||
if(authRes.cancel){
|
||||
this.$Router.back(this.$Route.query.type === 'edit' ? 1 : 2)
|
||||
}
|
||||
if(res.confirm){
|
||||
if(authRes.confirm){
|
||||
let goodsId = this.$Route.query.type === 'edit' ? this.$Route.query.id : res
|
||||
this.$Router.push({name: 'goodsAuth', params: { id: goodsId , type: 'goodsAdd', edit: this.$Route.query.type === 'edit'}})
|
||||
console.log(goodsId)
|
||||
this.$Router.push({name: 'goodsAddAuth', params: { id: goodsId , type: 'goodsAdd', edit: this.$Route.query.type === 'edit'}})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
methods:{
|
||||
// 选择分类
|
||||
onCategory(cid){
|
||||
this.$Router.push({name: 'GoodsMagAdd', params: {cid, id: this.category[this.stairIndex].category_id}})
|
||||
this.$Router.push({name: 'goodsAdd', params: {cid, id: this.category[this.stairIndex].category_id}})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,6 +77,7 @@
|
||||
};
|
||||
},
|
||||
created() {
|
||||
console.log(this.$Route.query)
|
||||
if(this.$Route.query.edit == 'true'){
|
||||
managesGoodsExtends(this.$Route.query.id).then(res => {
|
||||
this.productedAt = res.producted_at
|
||||
|
||||
@@ -47,6 +47,10 @@
|
||||
<view class="btn" @click="additionalOrBurning">确认</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
|
||||
<view class="basisc-btn">
|
||||
<button class="btn" type="default" @click="$Router.push({name: 'goodsaddClassify'})">添加商品权证</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -83,7 +87,6 @@
|
||||
managesGoodsIndex({
|
||||
status: this.status
|
||||
}).then(res => {
|
||||
console.log(res)
|
||||
this.goods = res.data
|
||||
this.pages = res.page
|
||||
})
|
||||
@@ -171,14 +174,44 @@
|
||||
}
|
||||
},
|
||||
onNavigationBarButtonTap() {
|
||||
this.$Router.push({name: 'addClassify'})
|
||||
// this.$Router.push({name: 'addClassify'})
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.basics-content{
|
||||
padding-bottom: ($padding*3) + 90;
|
||||
}
|
||||
|
||||
// 按钮组
|
||||
.basisc-btn{
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
padding: $padding;
|
||||
background: white;
|
||||
box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
|
||||
.btn {
|
||||
background: $mian-color;
|
||||
color: white;
|
||||
border-radius: 0;
|
||||
font-size: $title-size-lg;
|
||||
line-height: 88rpx;
|
||||
height: 88rpx;
|
||||
&::after {
|
||||
border: none;
|
||||
}
|
||||
&[disabled] {
|
||||
background: rgba($color: $mian-color, $alpha: .6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content{
|
||||
padding-top: 90rpx;
|
||||
padding-bottom: ($padding*3) + 90;
|
||||
}
|
||||
// tabs
|
||||
.tabs{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view>
|
||||
<view class="basics-content">
|
||||
<view class="create-form">
|
||||
<view class="header">
|
||||
<view @click="updLogo">
|
||||
@@ -47,10 +47,10 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="create-btns">
|
||||
<button class="item-btn btn-submit" type="default" @click="createShop">{{type === 'add' ? '创建': '保存'}}</button>
|
||||
<button class="item-btn btn-delete" type="default" @click="onDeleteShop" v-if="type === 'edit'">删除</button>
|
||||
</view>
|
||||
<view class="basisc-btn">
|
||||
<button class="add-modules" type="default" @click="onDeleteShop" v-if="type === 'edit'">删除</button>
|
||||
<button class="btn" type="default" @click="createShop">{{type === 'add' ? '创建': '保存'}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -211,6 +211,55 @@
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.basics-content{
|
||||
padding-bottom: ($padding*3) + 90;
|
||||
}
|
||||
|
||||
// 按钮组
|
||||
.basisc-btn{
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
padding: $padding;
|
||||
background: white;
|
||||
margin-top: $margin - 10;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
|
||||
.add-modules{
|
||||
line-height: 86rpx;
|
||||
height: 88rpx;
|
||||
text-align: center;
|
||||
color: $text-price;
|
||||
background: white;
|
||||
width: calc(50% - 15rpx);
|
||||
margin-right: 30rpx;
|
||||
border:solid 1rpx $mian-color;
|
||||
box-sizing: border-box;
|
||||
font-size: $title-size-lg;
|
||||
.icon{
|
||||
margin-right: $margin/3;
|
||||
}
|
||||
}
|
||||
.btn {
|
||||
background: $mian-color;
|
||||
color: white;
|
||||
border-radius: 8rpx;
|
||||
font-size: $title-size-lg;
|
||||
line-height: 88rpx;
|
||||
height: 88rpx;
|
||||
width: calc(50% - 15rpx);
|
||||
&::after {
|
||||
border: none;
|
||||
}
|
||||
|
||||
&[disabled] {
|
||||
background: rgba($color: $mian-color, $alpha: .6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 门店信息
|
||||
.create-form{
|
||||
.header{
|
||||
|
||||
@@ -160,7 +160,8 @@
|
||||
},
|
||||
|
||||
// 开通会员
|
||||
openOrder(){
|
||||
openOrder(){
|
||||
let can = this.canBtn,
|
||||
identitiesId = this.identitie[this.tabsIndex].identity_id
|
||||
if(this.selected == false) {
|
||||
uni.showToast({
|
||||
@@ -168,11 +169,23 @@
|
||||
icon : 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
// 判断是否线上,线下开通 can.on_line=true为线上开通
|
||||
if(can.on_line) {
|
||||
console.log('微信支付')
|
||||
if(can.on_line) {
|
||||
// 线上开通 - 再一次按断是否续费 can.buy= true为续费
|
||||
if(can.buy) {
|
||||
if(can.buy) {
|
||||
// 开通vip提交
|
||||
console.log('开通vip提交')
|
||||
this.vipSubmitr(identitiesId);
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: can.message,
|
||||
icon : 'none'
|
||||
})
|
||||
}
|
||||
} else {
|
||||
// 线下开通 - 再一次按断是否续费 can.buy= true为续费
|
||||
if(can.buy) {
|
||||
// 上传凭证
|
||||
this.canClick();
|
||||
} else {
|
||||
@@ -182,43 +195,41 @@
|
||||
})
|
||||
}
|
||||
}
|
||||
return
|
||||
let identitiesId = this.identitie[this.tabsIndex].identity_id
|
||||
return
|
||||
|
||||
},
|
||||
// 开通vip提交
|
||||
vipSubmitr(id) {
|
||||
vipOrder(id,{
|
||||
year: 1
|
||||
}).then(res => {
|
||||
if(!res.test){
|
||||
let verifyForm = res
|
||||
this.wechatPay(res.id)
|
||||
}else{
|
||||
// 测试环境
|
||||
uni.showModal({
|
||||
title : '开通提示',
|
||||
content : '会员开通成功,是否继续完成企业认证',
|
||||
showCancel : true,
|
||||
cancelText : '稍后认证',
|
||||
confirmText : '立即认证',
|
||||
success : modalRes => {
|
||||
if(modalRes.confirm){
|
||||
this.$Router.replace({name: 'Approve'})
|
||||
return
|
||||
}
|
||||
this.$Router.back()
|
||||
},
|
||||
fail(err) {
|
||||
}
|
||||
})
|
||||
}
|
||||
}).catch(err =>{
|
||||
uni.showToast({
|
||||
title: err.message,
|
||||
icon : 'none'
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
// 轻节点身份-跳转个人认证
|
||||
openUrl() {
|
||||
}).then(res => {
|
||||
if(!res.test){
|
||||
let verifyForm = res
|
||||
this.wechatPay(res.id)
|
||||
}else{
|
||||
// 测试环境
|
||||
uni.showModal({
|
||||
title : '开通提示',
|
||||
content : '会员开通成功,是否继续完成企业认证',
|
||||
showCancel : true,
|
||||
cancelText : '稍后认证',
|
||||
confirmText : '立即认证',
|
||||
success : modalRes => {
|
||||
if(modalRes.confirm){
|
||||
this.$Router.replace({name: 'Approve'})
|
||||
return
|
||||
}
|
||||
this.$Router.back()
|
||||
},
|
||||
fail(err) {
|
||||
}
|
||||
})
|
||||
}
|
||||
}).catch(err =>{
|
||||
uni.showToast({
|
||||
title: err.message,
|
||||
icon : 'none'
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user