Kirin vor 2 Jahren
Ursprung
Commit
7f21f16e7e

+ 3 - 1
app/admin/controller/store/StoreProduct.php

@@ -321,7 +321,9 @@ class StoreProduct extends AuthController
             ['attrs', []],
             ['activity', []],
             ['store_id', 0],
-            ['store_type', 1]
+            ['store_type', 1],
+            ['sp_user', 0],
+
         ]);
         foreach ($data['activity'] as $k => $v) {
             if ($v == '秒杀') {

+ 2 - 0
app/admin/controller/user/User.php

@@ -436,6 +436,7 @@ class User extends AuthController
         $f[] = Form::radio('area_admin', '区域代理', $user->getData('area_admin'))->options([['value' => 0, 'label' => '无'], ['value' => 1, 'label' => '区代'], ['value' => 2, 'label' => '市代'], ['value' => 3, 'label' => '省代']]);
         $f[] = Form::cityArea('area_address', '区域', $user->getData('area_province'), $user->getData('area_city'), $user->getData('area_district'));
         $f[] = Form::radio('is_point', '节点', $user->getData('is_point'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
+        $f[] = Form::radio('sp_user', 'VIP用户', $user->getData('sp_user'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
         $f[] = Form::radio('status', '状态', $user->getData('status'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '锁定']]);
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('uid' => $uid)), 5);
         $this->assign(compact('form'));
@@ -458,6 +459,7 @@ class User extends AuthController
             ['integration_status', 0],
             ['integration', 0],
             ['status', 0],
+            ['sp_user', 0],
             ['is_point', 0],
             ['area_admin'],
             ['store_id'],

+ 118 - 91
app/admin/view/store/store_product/create.php

@@ -150,7 +150,7 @@
     <div class="layui-row layui-col-space15" id="app" v-cloak="">
         <div class="layui-card">
             <div class="layui-card-header">
-                <span class="">{{id ? '商品修改': '商品添加' }}</span>
+                <span class="">{{id ? '商品修改' : '商品添加' }}</span>
                 <button style="margin-left: 20px" type="button" class="layui-btn layui-btn-primary layui-btn-xs"
                         @click="goBack">返回列表
                 </button>
@@ -233,7 +233,7 @@
                                                    autocomplete="off" placeholder="请输入视频链接" class="layui-input">
                                             <button type="button" @click="uploadVideo"
                                                     class="layui-btn layui-btn-sm layui-btn-normal">{{videoLink ? '确认添加'
-                                                : '上传视频'}}
+                                                        : '上传视频'}}
                                             </button>
                                             <input ref="filElem" type="file" style="display: none">
                                         </div>
@@ -750,8 +750,9 @@
                                         <div class="layui-col-xs4 layui-col-sm4 layui-col-md4">
                                             <div class="grid-demo grid-demo-bg1">
                                                 <div class="layui-form-item">
-<!--                                                    <label class="layui-form-label">返还币种</label>-->
-                                                    <select class="layui-input-block" v-model="formData.return_money_type"
+                                                    <!--                                                    <label class="layui-form-label">返还币种</label>-->
+                                                    <select class="layui-input-block"
+                                                            v-model="formData.return_money_type"
                                                             name="formData_return_money_type_default"
                                                             lay-filter="formData_return_money_type_default">
                                                         <option value="">请选择返还币种</option>
@@ -768,7 +769,8 @@
                                                 <div class="layui-form-item">
                                                     <label class="layui-form-label">返还数量</label>
                                                     <div class="layui-input-block">
-                                                        <input type="number" autocomplete="off" placeholder="请输入返还数量" class="layui-input"
+                                                        <input type="number" autocomplete="off" placeholder="请输入返还数量"
+                                                               class="layui-input"
                                                                v-model="formData.return_money">
                                                     </div>
                                                 </div>
@@ -781,7 +783,8 @@
                                                     <label class="layui-form-label">返还天数</label>
                                                     <div class="layui-input-block">
                                                         <input type="number" lay-verify="title"
-                                                               autocomplete="off" placeholder="请输入返还天数" class="layui-input"
+                                                               autocomplete="off" placeholder="请输入返还天数"
+                                                               class="layui-input"
                                                                v-model="formData.return_day">
                                                     </div>
                                                 </div>
@@ -807,7 +810,7 @@
                                                     消费返还:
                                                     <div class="layui-input-inline" style="width:450px;float: none">
                                                         <select type="number"
-                                                               name="brokerage_return_money_type"
+                                                                name="brokerage_return_money_type"
                                                                 lay-filter="brokerage_return_money_type"
                                                                 class="layui-input"
                                                                 v-model="brokerage.return_money_type">
@@ -882,9 +885,11 @@
                                                                 <select type="number"
                                                                         name="formData_return_money_type"
                                                                         lay-filter="formData_return_money_type"
-                                                                        class="layui-input"  v-model="formData.attr.return_money_type">
+                                                                        class="layui-input"
+                                                                        v-model="formData.attr.return_money_type">
                                                                     <option value="">请选择返还币种</option>
-                                                                    <option :value="item.code" v-for="item in money_type"
+                                                                    <option :value="item.code"
+                                                                            v-for="item in money_type"
                                                                             :selected=" formData.attr.return_money_type == item.code ? true : false ">
                                                                         {{item.name}}
                                                                     </option>
@@ -942,9 +947,11 @@
                                                                        class="layui-input">
                                                             </td>
                                                             <td><select type="text"
-                                                                        class="layui-input" v-model="item.return_money_type">
+                                                                        class="layui-input"
+                                                                        v-model="item.return_money_type">
                                                                     <option value="">请选择返还币种</option>
-                                                                    <option :value="itemm.code" v-for="itemm in money_type"
+                                                                    <option :value="itemm.code"
+                                                                            v-for="itemm in money_type"
                                                                             :selected=" item.return_money_type == itemm.code ? true : false ">
                                                                         {{itemm.name}}
                                                                     </option>
@@ -974,6 +981,21 @@
                                     <!--                                            </div>-->
                                     <!--                                        </div>-->
                                     <!--                                    </div>-->
+                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
+                                        <div class="grid-demo grid-demo-bg1">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">VIP商品</label>
+                                                <div class="layui-input-block">
+                                                    <input type="radio" name="sp_user" lay-filter="sp_user" value="1"
+                                                           title="开启"
+                                                           :checked="formData.sp_user == 1 ? true : false">
+                                                    <input type="radio" name="sp_user" lay-filter="sp_user" value="0"
+                                                           title="关闭"
+                                                           :checked="formData.sp_user == 0 ? true : false">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
@@ -1004,73 +1026,73 @@
                                             </div>
                                         </div>
                                     </div>
-<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
-<!--                                        <div class="grid-demo grid-demo-bg1">-->
-<!--                                            <div class="layui-form-item">-->
-<!--                                                <label class="layui-form-label">精品推荐</label>-->
-<!--                                                <div class="layui-input-block">-->
-<!--                                                    <input type="radio" name="is_best" lay-filter="is_best" value="1"-->
-<!--                                                           title="开启"-->
-<!--                                                           :checked="formData.is_best == 1 ? true : false">-->
-<!--                                                    <input type="radio" name="is_best" lay-filter="is_best" value="0"-->
-<!--                                                           title="关闭"-->
-<!--                                                           :checked="formData.is_best == 0 ? true : false">-->
-<!--                                                </div>-->
-<!--                                            </div>-->
-<!--                                        </div>-->
-<!--                                    </div>-->
-<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
-<!--                                        <div class="grid-demo grid-demo-bg1">-->
-<!--                                            <div class="layui-form-item">-->
-<!--                                                <label class="layui-form-label">首发新品</label>-->
-<!--                                                <div class="layui-input-block">-->
-<!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="1"-->
-<!--                                                           title="开启"-->
-<!--                                                           :checked="formData.is_new == 1 ? true : false">-->
-<!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="0"-->
-<!--                                                           title="关闭"-->
-<!--                                                           :checked="formData.is_new == 0 ? true : false">-->
-<!--                                                </div>-->
-<!--                                            </div>-->
-<!--                                        </div>-->
-<!--                                    </div>-->
-<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
-<!--                                        <div class="grid-demo grid-demo-bg1">-->
-<!--                                            <div class="layui-form-item">-->
-<!--                                                <label class="layui-form-label">优品推荐</label>-->
-<!--                                                <div class="layui-input-block">-->
-<!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="1"-->
-<!--                                                           title="开启"-->
-<!--                                                           :checked="formData.is_good == 1 ? true : false">-->
-<!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="0"-->
-<!--                                                           title="关闭"-->
-<!--                                                           :checked="formData.is_good == 0 ? true : false">-->
-<!--                                                </div>-->
-<!--                                            </div>-->
-<!--                                        </div>-->
-<!--                                    </div>-->
-<!--                                    <div class="layui-row layui-col-space15">-->
-<!--                                        <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">-->
-<!--                                            <div class="grid-demo grid-demo-bg1">-->
-<!--                                                <div class="layui-form-item">-->
-<!--                                                    <label class="layui-form-label">活动优先级</label>-->
-<!--                                                    <div class="layui-input-block">-->
-<!--                                                        <span class="layui-btn layui-btn-sm layui-btn-normal"-->
-<!--                                                              :style="'background-color:'+activity[item]"-->
-<!--                                                              v-for="(item,index) in formData.activity" :key="index"-->
-<!--                                                              draggable="true"-->
-<!--                                                              @dragstart="handleDragStart($event, item)"-->
-<!--                                                              @dragover.prevent="handleDragOver($event, item)"-->
-<!--                                                              @dragenter="handleDragEnter($event, item)"-->
-<!--                                                              @dragend="handleDragEnd($event, item)">-->
-<!--                                                        {{item}}-->
-<!--                                                    </span>-->
-<!--                                                        <span class="info">可拖动按钮调整活动的优先展示顺序</span>-->
-<!--                                                    </div>-->
-<!--                                                </div>-->
-<!--                                            </div>-->
-<!--                                        </div>-->
-<!--                                    </div>-->
+                                    <!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+                                    <!--                                        <div class="grid-demo grid-demo-bg1">-->
+                                    <!--                                            <div class="layui-form-item">-->
+                                    <!--                                                <label class="layui-form-label">精品推荐</label>-->
+                                    <!--                                                <div class="layui-input-block">-->
+                                    <!--                                                    <input type="radio" name="is_best" lay-filter="is_best" value="1"-->
+                                    <!--                                                           title="开启"-->
+                                    <!--                                                           :checked="formData.is_best == 1 ? true : false">-->
+                                    <!--                                                    <input type="radio" name="is_best" lay-filter="is_best" value="0"-->
+                                    <!--                                                           title="关闭"-->
+                                    <!--                                                           :checked="formData.is_best == 0 ? true : false">-->
+                                    <!--                                                </div>-->
+                                    <!--                                            </div>-->
+                                    <!--                                        </div>-->
+                                    <!--                                    </div>-->
+                                    <!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+                                    <!--                                        <div class="grid-demo grid-demo-bg1">-->
+                                    <!--                                            <div class="layui-form-item">-->
+                                    <!--                                                <label class="layui-form-label">首发新品</label>-->
+                                    <!--                                                <div class="layui-input-block">-->
+                                    <!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="1"-->
+                                    <!--                                                           title="开启"-->
+                                    <!--                                                           :checked="formData.is_new == 1 ? true : false">-->
+                                    <!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="0"-->
+                                    <!--                                                           title="关闭"-->
+                                    <!--                                                           :checked="formData.is_new == 0 ? true : false">-->
+                                    <!--                                                </div>-->
+                                    <!--                                            </div>-->
+                                    <!--                                        </div>-->
+                                    <!--                                    </div>-->
+                                    <!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+                                    <!--                                        <div class="grid-demo grid-demo-bg1">-->
+                                    <!--                                            <div class="layui-form-item">-->
+                                    <!--                                                <label class="layui-form-label">优品推荐</label>-->
+                                    <!--                                                <div class="layui-input-block">-->
+                                    <!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="1"-->
+                                    <!--                                                           title="开启"-->
+                                    <!--                                                           :checked="formData.is_good == 1 ? true : false">-->
+                                    <!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="0"-->
+                                    <!--                                                           title="关闭"-->
+                                    <!--                                                           :checked="formData.is_good == 0 ? true : false">-->
+                                    <!--                                                </div>-->
+                                    <!--                                            </div>-->
+                                    <!--                                        </div>-->
+                                    <!--                                    </div>-->
+                                    <!--                                    <div class="layui-row layui-col-space15">-->
+                                    <!--                                        <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">-->
+                                    <!--                                            <div class="grid-demo grid-demo-bg1">-->
+                                    <!--                                                <div class="layui-form-item">-->
+                                    <!--                                                    <label class="layui-form-label">活动优先级</label>-->
+                                    <!--                                                    <div class="layui-input-block">-->
+                                    <!--                                                        <span class="layui-btn layui-btn-sm layui-btn-normal"-->
+                                    <!--                                                              :style="'background-color:'+activity[item]"-->
+                                    <!--                                                              v-for="(item,index) in formData.activity" :key="index"-->
+                                    <!--                                                              draggable="true"-->
+                                    <!--                                                              @dragstart="handleDragStart($event, item)"-->
+                                    <!--                                                              @dragover.prevent="handleDragOver($event, item)"-->
+                                    <!--                                                              @dragenter="handleDragEnter($event, item)"-->
+                                    <!--                                                              @dragend="handleDragEnd($event, item)">-->
+                                    <!--                                                        {{item}}-->
+                                    <!--                                                    </span>-->
+                                    <!--                                                        <span class="info">可拖动按钮调整活动的优先展示顺序</span>-->
+                                    <!--                                                    </div>-->
+                                    <!--                                                </div>-->
+                                    <!--                                            </div>-->
+                                    <!--                                        </div>-->
+                                    <!--                                    </div>-->
                                 </div>
                             </div>
                         </div>
@@ -1112,7 +1134,11 @@
 </div>
 <script>
     var id = {$id};
-    var money_type = {:json_encode($money_type)};
+    var money_type = {
+    :
+    json_encode($money_type)
+    }
+    ;
     new Vue({
         el: '#app',
         data: {
@@ -1126,7 +1152,7 @@
                 videoIng: false
             },
             level_list: [],
-            money_type:money_type,
+            money_type: money_type,
             formData: {
                 cate_id: [],
                 temp_id: 0,
@@ -1165,6 +1191,7 @@
                 sort: 0,
                 is_show: 1,
                 is_hot: 0,
+                sp_user: 0,
                 is_benefit: 0,
                 is_best: 0,
                 is_new: 0,
@@ -1214,7 +1241,7 @@
             activity: {'秒杀': '#1E9FFF', '砍价': '#189688', '拼团': '#FEB900'},
             attr: [],//临时属性
             newRule: false,//是否添加新规则
-            radioRule: ['store_type', 'is_sub', 'is_show', 'is_hot', 'is_benefit', 'is_new', 'is_good', 'is_best', 'spec_type'],//radio 当选规则
+            radioRule: ['store_type', 'is_sub', 'is_show', 'sp_user', 'is_hot', 'is_benefit', 'is_new', 'is_good', 'is_best', 'spec_type'],//radio 当选规则
             rule: { //多图选择规则
                 slider_image: {
                     maxLength: 5
@@ -1306,16 +1333,16 @@
                 });
             },
             addBrokerage: function () {
-                    var that = this;
-                    this.$set(this.formData, 'attrs', this.formData.attrs.map(function (item) {
-                        item.brokerage = that.brokerage.brokerage;
-                        item.brokerage_two = that.brokerage.brokerage_two;
-                        item.return_money_type = that.brokerage.return_money_type;
-                        item.return_money = that.brokerage.return_money;
-                        item.return_day = that.brokerage.return_day;
-                        return item;
-                    }));
-                    this.render();
+                var that = this;
+                this.$set(this.formData, 'attrs', this.formData.attrs.map(function (item) {
+                    item.brokerage = that.brokerage.brokerage;
+                    item.brokerage_two = that.brokerage.brokerage_two;
+                    item.return_money_type = that.brokerage.return_money_type;
+                    item.return_money = that.brokerage.return_money;
+                    item.return_day = that.brokerage.return_day;
+                    return item;
+                }));
+                this.render();
             },
             batchClear: function () {
                 this.$set(this, 'batchAttr', {