mirror of
https://github.com/crmeb/CRMEB.git
synced 2026-11-02 16:00:40 +00:00
Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev
This commit is contained in:
evoxwht
commit
c5fc4c3c3c
@ -7,7 +7,7 @@
|
||||
text-align: center;
|
||||
// color: #fff;
|
||||
cursor: pointer;
|
||||
z-index: 9999;
|
||||
z-index: 99;
|
||||
.iconcaidanshouqi {
|
||||
.trans;
|
||||
vertical-align: top;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<span>
|
||||
<Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
|
||||
</span>
|
||||
<Divider type="vertical"/>
|
||||
<Divider type="vertical" />
|
||||
<span class="ivu-page-header-title">{{ $route.meta.title }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -16,6 +16,7 @@
|
||||
:label-width="labelWidth"
|
||||
:label-position="labelPosition"
|
||||
class="tabform"
|
||||
:rules="ruleValidate"
|
||||
@submit.native.prevent
|
||||
>
|
||||
<Col span="24">
|
||||
@ -26,7 +27,7 @@
|
||||
>
|
||||
</Col>
|
||||
<Col span="24">
|
||||
<FormItem label="选择主播：">
|
||||
<FormItem label="选择主播：" prop="anchor_wechat">
|
||||
<Select
|
||||
v-model="formValidate.anchor_wechat"
|
||||
filterable
|
||||
@ -40,7 +41,7 @@
|
||||
</Col>
|
||||
<Row :gutter="24" type="flex">
|
||||
<Col span="24">
|
||||
<FormItem label="直播间名称：">
|
||||
<FormItem label="直播间名称：" prop="name">
|
||||
<Input
|
||||
enter-button
|
||||
placeholder="请输入直播间名称"
|
||||
@ -52,7 +53,7 @@
|
||||
</Col>
|
||||
<Col span="24">
|
||||
<div style="display: flex">
|
||||
<FormItem label="背景图：">
|
||||
<FormItem label="背景图：" prop="name">
|
||||
<div @click="modalPicTap(0)" class="box">
|
||||
<img :src="formValidate.cover_img" alt="" v-if="formValidate.cover_img" />
|
||||
<div class="upload-box" v-else>
|
||||
@ -93,7 +94,7 @@
|
||||
</FormItem>
|
||||
</Col>
|
||||
<Col span="24">
|
||||
<FormItem label="直播时间：">
|
||||
<FormItem label="直播时间：" prop="name">
|
||||
<DatePicker
|
||||
type="datetimerange"
|
||||
format="yyyy-MM-dd HH:mm"
|
||||
@ -322,6 +323,10 @@ export default {
|
||||
activeIndex: 0,
|
||||
liveList: [],
|
||||
modal3: false,
|
||||
ruleValidate: {
|
||||
anchor_wechat: [{ required: true, message: 'Please select the city', trigger: 'change' }],
|
||||
name: [{ required: true, message: 'The name cannot be empty', trigger: 'blur' }],
|
||||
},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
||||
@ -128,7 +128,6 @@
|
||||
:columns="columns2"
|
||||
:data="receiveList"
|
||||
ref="table"
|
||||
class="mt25"
|
||||
:loading="loading2"
|
||||
highlight-row
|
||||
no-userFrom-text="暂无数据"
|
||||
|
||||
@ -1231,9 +1231,11 @@
|
||||
<Input v-model="disk_info" size="large" type="textarea" :rows="4" placeholder="填写卡密信息" />
|
||||
</div>
|
||||
<div class="stock-input">
|
||||
<Input type="number" v-model="stock" size="large" placeholder="填写库存数量">
|
||||
<!-- <Input type="number" v-model="stock" size="large" :min='0' placeholder="填写库存数量">
|
||||
<span slot="append">件</span>
|
||||
</Input>
|
||||
</Input> -->
|
||||
<InputNumber :max="100000" :min="1" :step="1" :precision="0" v-model="stock" />
|
||||
<span class="pl10">件</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scroll-virtual" v-if="disk_type == 2">
|
||||
|
||||
@ -716,3 +716,7 @@ body {
|
||||
.pt10 {
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.pl10 {
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
@ -1,11 +1,3 @@
|
||||
<!--
|
||||
parser 主模块组件
|
||||
github：https://github.com/jin-yufeng/Parser
|
||||
docs：https://jin-yufeng.github.io/Parser
|
||||
插件市场：https://ext.dcloud.net.cn/plugin?id=805
|
||||
author：JinYufeng
|
||||
update：2020/04/14
|
||||
-->
|
||||
<template>
|
||||
<view>
|
||||
<slot v-if="!nodes.length" />
|
||||
@ -369,6 +361,7 @@
|
||||
_ts.videoContexts = videos;
|
||||
for (let video, i = 0; video = videos[i++];) {
|
||||
video.style.maxWidth = '100%';
|
||||
video.style.height = 'auto';
|
||||
video.onerror = function() {
|
||||
_ts.$emit('error', {
|
||||
source: 'video',
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
<navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">{{$t(`购买即视为同意`)}}《<text
|
||||
class="mark">{{$t(`会员用户协议`)}}</text>》</navigator>
|
||||
</view>
|
||||
<view class="buy" @click="pay">{{$t(`立即支付`)}}</view>
|
||||
<view class="buy" @click="pay">{{ type=== 'free'? $t(`立即试用`) : $t(`立即支付`)}}</view>
|
||||
<view class="cash">
|
||||
<text @click="drawMemberCard">{{$t(`点击兑换卡密`)}}</text>
|
||||
</view>
|
||||
@ -1280,4 +1280,4 @@
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@ -359,13 +359,16 @@
|
||||
.productList .item .text .vip .vip-money {
|
||||
font-size: 24rpx;
|
||||
color: #282828;
|
||||
font-weight: bold;
|
||||
font-weight: bold;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.productList .item .text .vip .vip-money image {
|
||||
width: 46rpx;
|
||||
height: 21rpx;
|
||||
margin-left: 4rpx;
|
||||
margin-left: 4rpx;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
|
||||
.empty-img {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<view class="admin" @click="showRadio">{{checkbox_show?$t(`取消`):$t(`管理`)}}</view>
|
||||
</view>
|
||||
<checkbox-group @change="checkboxChange">
|
||||
<view class='item acea-row' v-for="(item,index) in collectProductList" :key="index">
|
||||
<view class='item acea-row' v-for="(item,index) in collectProductList" :key="index" @click="jump(item)">
|
||||
<view class="left">
|
||||
<checkbox v-show="checkbox_show" :value="item.pid.toString()" :checked="item.checked" />
|
||||
<view class='pictrue'>
|
||||
@ -16,7 +16,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class='text acea-row row-column-between' @click="jump(item)">
|
||||
<view class='text acea-row row-column-between'>
|
||||
<view class='name line2'>{{item.store_name}}</view>
|
||||
<view class='acea-row row-between-wrapper'>
|
||||
<view class='money font-color'>{{$t(`￥`)}}{{item.price}}</view>
|
||||
@ -326,7 +326,7 @@
|
||||
height: 130rpx;
|
||||
flex: 1;
|
||||
font-size: 28rpx;
|
||||
color: #282828;
|
||||
color: #282828;
|
||||
padding-right: 20rpx;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -138,7 +138,8 @@
|
||||
key: that.key,
|
||||
captchaType: 'blockPuzzle',
|
||||
captchaVerification: data.captchaVerification
|
||||
}).then(res => {
|
||||
}).then(res => {
|
||||
this.sendCode()
|
||||
that.$util.Tips({
|
||||
title: res.msg
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user