mirror of
https://github.com/crmeb/CRMEB.git
synced 2025-12-15 04:52:50 +00:00
修复文件换行符bug
This commit is contained in:
sugar1569
parent
a8e0653a98
commit
9920e63f13
File diff suppressed because one or more lines are too long
@ -8,6 +8,7 @@
|
||||
<link href="{__FRAME_PATH}css/plugins/footable/footable.core.css" rel="stylesheet">
|
||||
<script src="{__PLUG_PATH}sweetalert2/sweetalert2.all.min.js"></script>
|
||||
<script src="{__FRAME_PATH}js/plugins/footable/footable.all.min.js"></script>
|
||||
<script src="{__ADMIN_PATH}js/layuiList.js"></script>
|
||||
<style>
|
||||
.on-tag{background-color: #eea91e;}
|
||||
.height-auto{height: 300px;}
|
||||
@ -547,7 +548,8 @@
|
||||
}
|
||||
}
|
||||
var str = chk_value.join(',');
|
||||
var url = "http://"+window.location.host+"/admin/store.store_coupon/grant/id/"+str;
|
||||
// var url = "http://"+window.location.host+"/admin/store.store_coupon/grant/id/"+str;
|
||||
var url = layList.U({c:'store.store_coupon',a:'grant',p:{id:str}});
|
||||
$eb.createModalFrame(this.innerText,url,{'w':800});
|
||||
})
|
||||
$('.news').on('click',function (e) {
|
||||
@ -570,7 +572,8 @@
|
||||
}
|
||||
}
|
||||
var str = chk_value.join(',');
|
||||
var url = "http://"+window.location.host+"/admin/wechat.wechat_news_category/send_news/id/"+str;
|
||||
// var url = "http://"+window.location.host+"/admin/wechat.wechat_news_category/send_news/id/"+str;
|
||||
var url = layList.U({c:'wechat.wechat_news_category',a:'send_news',p:{id:str}});
|
||||
$eb.createModalFrame(this.innerText,url,{'w':800});
|
||||
})
|
||||
$('.synchro').on('click',function(){
|
||||
|
||||
@ -1 +1,62 @@
|
||||
<!DOCTYPE html>
<html lang="zh-CN">
<head>
{include file="public/head"}
<title>{$title}</title>
</head>
<body>
<div id="form-add" class="mp-form" v-cloak="">
<form-builder></form-builder>
</div>
<!--suppress JSAnnotator -->
<script>
var _vm ;
var rules = {$rules};
console.log(rules);
_mpApi = parent._mpApi;
mpFrame.start(function(Vue){
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
Vue.use(mpFormBuilder,_mpApi,rules,{
action:'{$save}'
});
new Vue({
el:"#form-add",
mounted:function(){
}
})
});
});
</script>
</body>
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html lang="zh-CN">
|
||||
|
||||
<head>
|
||||
|
||||
{include file="public/head"}
|
||||
|
||||
<title>{$title}</title>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="form-add" class="mp-form" v-cloak="">
|
||||
|
||||
|
||||
<form-builder></form-builder>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<!--suppress JSAnnotator -->
|
||||
<script>
|
||||
|
||||
var _vm ;
|
||||
var rules = {$rules};
|
||||
console.log(rules);
|
||||
|
||||
_mpApi = parent._mpApi;
|
||||
|
||||
|
||||
|
||||
mpFrame.start(function(Vue){
|
||||
|
||||
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
|
||||
|
||||
Vue.use(mpFormBuilder,_mpApi,rules,{
|
||||
|
||||
action:'{$save}'
|
||||
|
||||
});
|
||||
|
||||
new Vue({
|
||||
|
||||
el:"#form-add",
|
||||
|
||||
mounted:function(){
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1,77 @@
|
||||
<!DOCTYPE html>
<!--suppress JSAnnotator -->
<html lang="zh-CN">
<head>
{include file="public/head"}
<title>{$title}</title>
</head>
<body>
<div id="form-add" class="mp-form" v-cloak="">
<form-builder></form-builder>
</div>
<style>
#eb-field-icon input{width: 80%}
</style>
<script>
var _vm ;
var rules = {$rules};
// console.log(rules);
function openicon() {
layer.open({
type: 2,
content: '/admin/system.system_menus/icon.html',
area: ['600px', '600px'],
maxmin: true
});
// $eb.createModalFrame(this.innerText,"/admin/system.system_menus/icon.html");
}
_mpApi = parent._mpApi;
mpFrame.start(function(Vue){
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
Vue.use(mpFormBuilder,_mpApi,rules,{
action:'{$save}'
});
new Vue({
el:"#form-add",
mounted:function(){
window._$setIcon = (icon)=>{
this.$formBuilder.set('icon',icon);
};
$('#eb-field-icon').find('input').after('<button type="button" class="ivu-btn" onclick="openicon()")>选择图标</button>');
}
})
});
});
</script>
</body>
|
||||
<!DOCTYPE html>
|
||||
|
||||
<!--suppress JSAnnotator -->
|
||||
<html lang="zh-CN">
|
||||
|
||||
<head>
|
||||
|
||||
{include file="public/head"}
|
||||
|
||||
<title>{$title}</title>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="form-add" class="mp-form" v-cloak="">
|
||||
|
||||
|
||||
|
||||
<form-builder></form-builder>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<style>
|
||||
#eb-field-icon input{width: 80%}
|
||||
</style>
|
||||
<script>
|
||||
|
||||
var _vm ;
|
||||
var rules = {$rules};
|
||||
// console.log(rules);
|
||||
function openicon() {
|
||||
layer.open({
|
||||
type: 2,
|
||||
content: '/admin/system.system_menus/icon.html',
|
||||
area: ['600px', '600px'],
|
||||
maxmin: true
|
||||
});
|
||||
// $eb.createModalFrame(this.innerText,"/admin/system.system_menus/icon.html");
|
||||
}
|
||||
_mpApi = parent._mpApi;
|
||||
|
||||
|
||||
|
||||
mpFrame.start(function(Vue){
|
||||
|
||||
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
|
||||
|
||||
Vue.use(mpFormBuilder,_mpApi,rules,{
|
||||
|
||||
action:'{$save}'
|
||||
|
||||
});
|
||||
|
||||
new Vue({
|
||||
|
||||
el:"#form-add",
|
||||
|
||||
mounted:function(){
|
||||
window._$setIcon = (icon)=>{
|
||||
this.$formBuilder.set('icon',icon);
|
||||
};
|
||||
$('#eb-field-icon').find('input').after('<button type="button" class="ivu-btn" onclick="openicon()")>选择图标</button>');
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
@ -1 +1,62 @@
|
||||
<!DOCTYPE html>
<!--suppress JSAnnotator -->
<html lang="zh-CN">
<head>
{include file="public/head"}
<title>{$title}</title>
</head>
<body>
<div id="form-add" class="mp-form" v-cloak="">
<form-builder></form-builder>
</div>
<script>
var _vm ;
var rules = {$rules};
// console.log(rules);
_mpApi = parent._mpApi;
mpFrame.start(function(Vue){
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
Vue.use(mpFormBuilder,_mpApi,rules,{
action:'{$save}'
});
new Vue({
el:"#form-add",
mounted:function(){
}
})
});
});
</script>
</body>
|
||||
<!DOCTYPE html>
|
||||
|
||||
<!--suppress JSAnnotator -->
|
||||
<html lang="zh-CN">
|
||||
|
||||
<head>
|
||||
|
||||
{include file="public/head"}
|
||||
|
||||
<title>{$title}</title>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="form-add" class="mp-form" v-cloak="">
|
||||
|
||||
|
||||
<form-builder></form-builder>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<script>
|
||||
|
||||
var _vm ;
|
||||
var rules = {$rules};
|
||||
// console.log(rules);
|
||||
|
||||
_mpApi = parent._mpApi;
|
||||
|
||||
|
||||
|
||||
mpFrame.start(function(Vue){
|
||||
|
||||
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
|
||||
|
||||
Vue.use(mpFormBuilder,_mpApi,rules,{
|
||||
|
||||
action:'{$save}'
|
||||
|
||||
});
|
||||
|
||||
new Vue({
|
||||
|
||||
el:"#form-add",
|
||||
|
||||
mounted:function(){
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
@ -1 +1,78 @@
|
||||
<!DOCTYPE html>
<html lang="zh-CN">
<head>
{include file="public/head"}
<title>{$title}</title>
</head>
<body>
<div id="form-add" class="mp-form" v-cloak="">
<form-builder></form-builder>
</div>
<style>
#eb-field-icon input{width: 80%}
</style>
<script>
var _vm ;
_mpApi = parent._mpApi;
function openicon() {
layer.open({
type: 2,
content: '/admin/system.system_menus/icon.html',
area: ['600px', '600px'],
maxmin: true
});
// $eb.createModalFrame(this.innerText,"/admin/system.system_menus/icon.html");
}
mpFrame.start(function(Vue){
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
axios.post('{$read}').then((result)=>{
Vue.use(mpFormBuilder,_mpApi,result.data,{
action:'{$update}'
});
new Vue({
el:"#form-add",
mounted:function(){
window._$setIcon = (icon)=>{
this.$formBuilder.set('icon',icon);
};
$('#eb-field-icon').find('input').after('<button type="button" class="ivu-btn" onclick="openicon()")>选择图标</button>');
}
})
})
});
});
</script>
</body>
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html lang="zh-CN">
|
||||
|
||||
<head>
|
||||
|
||||
{include file="public/head"}
|
||||
|
||||
<title>{$title}</title>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="form-add" class="mp-form" v-cloak="">
|
||||
|
||||
|
||||
|
||||
<form-builder></form-builder>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<style>
|
||||
#eb-field-icon input{width: 80%}
|
||||
</style>
|
||||
<script>
|
||||
|
||||
var _vm ;
|
||||
|
||||
_mpApi = parent._mpApi;
|
||||
|
||||
|
||||
function openicon() {
|
||||
layer.open({
|
||||
type: 2,
|
||||
content: '/admin/system.system_menus/icon.html',
|
||||
area: ['600px', '600px'],
|
||||
maxmin: true
|
||||
});
|
||||
// $eb.createModalFrame(this.innerText,"/admin/system.system_menus/icon.html");
|
||||
}
|
||||
mpFrame.start(function(Vue){
|
||||
|
||||
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
|
||||
|
||||
axios.post('{$read}').then((result)=>{
|
||||
|
||||
Vue.use(mpFormBuilder,_mpApi,result.data,{
|
||||
|
||||
action:'{$update}'
|
||||
|
||||
});
|
||||
|
||||
new Vue({
|
||||
|
||||
el:"#form-add",
|
||||
|
||||
mounted:function(){
|
||||
window._$setIcon = (icon)=>{
|
||||
this.$formBuilder.set('icon',icon);
|
||||
};
|
||||
$('#eb-field-icon').find('input').after('<button type="button" class="ivu-btn" onclick="openicon()")>选择图标</button>');
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
@ -1 +1,174 @@
|
||||
<!DOCTYPE html>
<html lang="zh-CN">
<head>
{include file="public/head"}
<title>{$title}</title>
</head>
<body>
<div id="form-add" class="mp-form" v-cloak="">
<?php /* <i-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
<form-Item label="菜单名称" prop="name">
<i-input v-model="formValidate.name" placeholder="请输入姓名"></i-input>
</form-Item>
<form-Item label="邮箱" prop="mail">
<i-input v-model="formValidate.mail" placeholder="请输入邮箱"></i-input>
</form-Item>
<form-Item label="城市" prop="city">
<i-select v-model="formValidate.city" placeholder="请选择所在地">
<i-option value="beijing">北京市</i-option>
<i-option value="shanghai">上海市</i-option>
<i-option value="shenzhen">深圳市</i-option>
</i-select>
</form-Item>
<Form-Item label="选择日期">
<Row>
<i-col span="11">
<form-Item prop="date">
<Date-Picker type="date" placeholder="选择日期" v-model="formValidate.date"></Date-Picker>
</form-Item>
</i-col>
<i-Col span="1" style="text-align: center">-</i-Col>
<i-Col span="11">
<form-Item prop="time">
<Time-Picker type="time" placeholder="选择时间" v-model="formValidate.time"></Time-Picker>
</form-Item>
</i-Col>
</Row>
</Form-Item>
<form-Item label="性别" prop="gender">
<Radio-Group v-model="formValidate.gender">
<Radio label="male">男</Radio>
<Radio label="female">女</Radio>
</Radio-Group>
</form-Item>
<form-Item label="爱好" prop="interest">
<Checkbox-Group v-model="formValidate.interest">
<Checkbox label="吃饭"></Checkbox>
<Checkbox label="睡觉"></Checkbox>
<Checkbox label="跑步"></Checkbox>
<Checkbox label="看电影"></Checkbox>
</Checkbox-Group>
</form-Item>
<component :is="componentId" label="介绍" prop="desc">
<component :is="componentIs" v-model="formValidate.desc" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></component>
</component>
<form-Item label="介绍" prop="desc">
<i-input v-model="formValidate.desc" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></i-input>
</form-Item>
<form-Item>
<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
<i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
</form-Item>
</i-form>
<m-mycom>
</m-mycom> */ ?>
<form-builder></form-builder>
</div>
<script>
var _vm ;
_mpApi = parent._mpApi;
mpFrame.start(function(Vue){
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
axios.post('{$read}').then((result)=>{
Vue.use(mpFormBuilder,_mpApi,result.data,{
action:'{$update}'
});
new Vue({
el:"#form-add",
mounted:function(){
}
})
})
});
});
</script>
</body>
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html lang="zh-CN">
|
||||
|
||||
<head>
|
||||
|
||||
{include file="public/head"}
|
||||
|
||||
<title>{$title}</title>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="form-add" class="mp-form" v-cloak="">
|
||||
|
||||
<?php /* <i-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
|
||||
|
||||
<form-Item label="菜单名称" prop="name">
|
||||
|
||||
<i-input v-model="formValidate.name" placeholder="请输入姓名"></i-input>
|
||||
|
||||
</form-Item>
|
||||
|
||||
<form-Item label="邮箱" prop="mail">
|
||||
|
||||
<i-input v-model="formValidate.mail" placeholder="请输入邮箱"></i-input>
|
||||
|
||||
</form-Item>
|
||||
|
||||
<form-Item label="城市" prop="city">
|
||||
|
||||
<i-select v-model="formValidate.city" placeholder="请选择所在地">
|
||||
|
||||
<i-option value="beijing">北京市</i-option>
|
||||
|
||||
<i-option value="shanghai">上海市</i-option>
|
||||
|
||||
<i-option value="shenzhen">深圳市</i-option>
|
||||
|
||||
</i-select>
|
||||
|
||||
</form-Item>
|
||||
|
||||
<Form-Item label="选择日期">
|
||||
|
||||
<Row>
|
||||
|
||||
<i-col span="11">
|
||||
|
||||
<form-Item prop="date">
|
||||
|
||||
<Date-Picker type="date" placeholder="选择日期" v-model="formValidate.date"></Date-Picker>
|
||||
|
||||
</form-Item>
|
||||
|
||||
</i-col>
|
||||
|
||||
<i-Col span="1" style="text-align: center">-</i-Col>
|
||||
|
||||
<i-Col span="11">
|
||||
|
||||
<form-Item prop="time">
|
||||
|
||||
<Time-Picker type="time" placeholder="选择时间" v-model="formValidate.time"></Time-Picker>
|
||||
|
||||
</form-Item>
|
||||
|
||||
</i-Col>
|
||||
|
||||
</Row>
|
||||
|
||||
</Form-Item>
|
||||
|
||||
<form-Item label="性别" prop="gender">
|
||||
|
||||
<Radio-Group v-model="formValidate.gender">
|
||||
|
||||
<Radio label="male">男</Radio>
|
||||
|
||||
<Radio label="female">女</Radio>
|
||||
|
||||
</Radio-Group>
|
||||
|
||||
</form-Item>
|
||||
|
||||
<form-Item label="爱好" prop="interest">
|
||||
|
||||
<Checkbox-Group v-model="formValidate.interest">
|
||||
|
||||
<Checkbox label="吃饭"></Checkbox>
|
||||
|
||||
<Checkbox label="睡觉"></Checkbox>
|
||||
|
||||
<Checkbox label="跑步"></Checkbox>
|
||||
|
||||
<Checkbox label="看电影"></Checkbox>
|
||||
|
||||
</Checkbox-Group>
|
||||
|
||||
</form-Item>
|
||||
|
||||
<component :is="componentId" label="介绍" prop="desc">
|
||||
|
||||
<component :is="componentIs" v-model="formValidate.desc" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></component>
|
||||
|
||||
</component>
|
||||
|
||||
<form-Item label="介绍" prop="desc">
|
||||
|
||||
<i-input v-model="formValidate.desc" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></i-input>
|
||||
|
||||
</form-Item>
|
||||
|
||||
<form-Item>
|
||||
|
||||
<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
|
||||
|
||||
<i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
|
||||
|
||||
</form-Item>
|
||||
|
||||
</i-form>
|
||||
|
||||
<m-mycom>
|
||||
|
||||
</m-mycom> */ ?>
|
||||
|
||||
<form-builder></form-builder>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<script>
|
||||
|
||||
var _vm ;
|
||||
|
||||
_mpApi = parent._mpApi;
|
||||
|
||||
|
||||
|
||||
mpFrame.start(function(Vue){
|
||||
|
||||
require(['axios','system/util/mpFormBuilder'],function(axios,mpFormBuilder){
|
||||
|
||||
axios.post('{$read}').then((result)=>{
|
||||
|
||||
Vue.use(mpFormBuilder,_mpApi,result.data,{
|
||||
|
||||
action:'{$update}'
|
||||
|
||||
});
|
||||
|
||||
new Vue({
|
||||
|
||||
el:"#form-add",
|
||||
|
||||
mounted:function(){
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -156,4 +156,15 @@ class StoreBargain extends ModelBasic
|
||||
if(!$id) return false;
|
||||
return self::where('id',$id)->inc('look',1)->update();
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO 判断是否可以出售
|
||||
* @param $id
|
||||
* @param int $cartNum
|
||||
* @return int|string
|
||||
* @throws \think\Exception
|
||||
*/
|
||||
public static function isValidCartBargain($id,$cartNum = 1){
|
||||
return self::validWhere()->where('id',$id)->where('stock','>',$cartNum)->count();
|
||||
}
|
||||
}
|
||||
@ -115,7 +115,7 @@ class StoreBargainUser extends ModelBasic
|
||||
*/
|
||||
public static function getBargainUserDiffPrice($bargainId = 0,$bargainUserId = 0){
|
||||
$price = self::where('bargain_id',$bargainId)->where('uid',$bargainUserId)->field('bargain_price,bargain_price_min')->find()->toArray();
|
||||
return (float)bcsub($price['bargain_price'],$price['bargain_price_min'],0);
|
||||
return (float)bcsub($price['bargain_price'],$price['bargain_price_min'],2);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -157,4 +157,15 @@ class StoreCombination extends ModelBasic
|
||||
return $model->count();
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO 判断是否可以出售
|
||||
* @param $id
|
||||
* @param int $cartNum
|
||||
* @return int|string
|
||||
* @throws \think\Exception
|
||||
*/
|
||||
public static function isValidCartCombination($id,$cartNum = 1){
|
||||
return self::where('id',$id)->where('is_del',0)->where('is_show',1)->where('stock','>',$cartNum)->count();
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user