Преглед изворни кода

修改直播相关得提示

xzh пре 4 година
родитељ
комит
767bf8bb95

+ 184 - 0
admins/fd-mall-backstage/WEB-INF/page/brand.html

@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+    <div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="8" >
+                    <div style="display: inline-block;">
+                        <i-input v-model="q.name" @on-enter="query" placeholder="店铺名称"/>
+                    </div>
+                    <div style="display: inline-block;">
+                        <i-select v-model="q.type" >
+                            <i-option value=" ">全部</i-option>
+                            <i-option value="0">服饰</i-option>
+                            <i-option value="1">家具</i-option>
+                            <i-option value="2">数码</i-option>
+                            <i-option value="3">娱乐</i-option>
+                            <i-option value="4">其他</i-option>
+                        </i-select>
+                    </div>
+                    <div style="display: inline-block;">
+                        <i-button @click="query">查询</i-button>
+                    </div>
+                </i-col>
+            
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("brand:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("brand:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("brand:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </div>
+        </Row>
+        <table id="jqGrid"></table>
+        <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+        <i-form ref="formValidate" :model="brand" :rules="ruleValidate" :label-width="110">
+            <div style="width: 100%;">
+                <Form-item label="店铺名称" prop="name">
+                    <div class="c-winput">
+                        <i-input v-model="brand.name" placeholder="店铺名称"/>
+                    </div>
+                </Form-item>
+                <Form-item label="店铺封面" prop="listPicUrl">
+                    <div class="c-winput">
+                        <i-input v-model="brand.listPicUrl" placeholder="图片" readonly/>
+                    </div>
+                    <div class="c-btn">
+                        <Upload action="../sys/oss/upload" :format="['jpg','jpeg','png']"
+                                max-size="2048"
+                                :on-success="handleSuccessListPicUrl" :on-format-error="handleFormatError"
+                                :show-upload-list="false"
+                                :on-exceeded-size="handleMaxSize">
+                            <i-button icon="ios-cloud-upload-outline">上传图片</i-button>
+                        </Upload>
+                    </div>
+                    <div class="c-btn">
+                        <div class="c-winput">
+                         <i-button icon="eye" @click="eyeImageListPicUrl">预览图片</i-button>
+                        </div>
+                    </div>
+                </Form-item>
+                   
+                <Form-item label="描述" prop="simpleDesc">
+                    <div class="c-winput">
+                        <i-input type="textarea" v-model="brand.simpleDesc" placeholder="描述"/>
+                    </div>
+                </Form-item>
+                <!-- <Row>
+                    <i-col span="16">
+                        <Form-item label="缩略图" prop="picUrl">
+                            <i-input v-model="brand.picUrl" placeholder="缩略图" readonly/>
+                        </Form-item>
+                    </i-col>
+                    <i-col span="3">
+                        <Form-item :label-width="1">
+                            <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
+                                    max-size="2048"
+                                    :on-success="handleSuccessPicUrl" :on-format-error="handleFormatError"
+                                    :show-upload-list="false"
+                                    :on-exceeded-size="handleMaxSize">
+                                <i-button icon="ios-cloud-upload-outline">上传图片</i-button>
+                            </Upload>
+                        </Form-item>
+                    </i-col>
+                    <i-col span="3">
+                        <Form-item :label-width="1">
+                            <i-button icon="eye" @click="eyeImagePicUrl">预览图片</i-button>
+                        </Form-item>
+                    </i-col>
+                </Row> -->
+                <Form-item label="排序" prop="sortOrder">
+                    <div class="c-winput">
+                        <Input-number :min="0" :step="1" v-model="brand.sortOrder" placeholder="排序" style="width: 188px;"/>
+                    </div>
+                </Form-item>
+                <Form-item label="显示" prop="isShow">
+                    <div class="c-winput">
+                        <Radio-group v-model="brand.isShow">
+                            <Radio label="1">
+                                <span>是</span>
+                            </Radio>
+                            <Radio label="0">
+                                <span>否</span>
+                            </Radio>
+                        </Radio-group>
+                    </div>
+                </Form-item>
+    
+                <Form-item label="店铺类型" prop="type" style="width: 288px;">
+                    <div class="c-winput">
+                        <i-select v-model="brand.type">
+                            <i-option v-for="typeitem in typeList" :value="typeitem.id"
+                                    :key="typeitem.id">{{typeitem.name}}
+                            </i-option>
+                        </i-select>
+                    </div>
+
+                </Form-item>
+    
+                <Form-item label="店铺场景链接" prop="sceneUrl">
+                    <div class="c-winput">
+                        <i-button type="primary" @click="addSceneLink">编辑场景链接</i-button>
+                        <div>场景链接:{{brand.sceneUrl||'-'}}</div>
+                        <div>场景名称:{{brand.sceneName||'-'}}</div>
+                    </div>
+                    <!-- <div class="c-winput">
+                        <i-input v-model="brand.sceneUrl" placeholder="店铺场景链接"/>
+                    </div> -->
+                </Form-item>
+                
+                <!-- <Form-item label="分享图" prop="newPicUrl">
+                    <div class="c-winput">
+                        <i-input v-model="brand.newPicUrl" placeholder="分享图(宽高比:(5:4))" readonly/>
+                    </div>
+                    <div class="c-btn">
+                        <Upload action="../sys/oss/upload" :format="['jpg','jpeg','png']"
+                                max-size="2048"
+                                :on-success="handleSuccessNewPicUrl" :on-format-error="handleFormatError"
+                                :show-upload-list="false"
+                                :on-exceeded-size="handleMaxSize">
+                            <i-button icon="ios-cloud-upload-outline">上传图片</i-button>
+                        </Upload>
+                    </div>
+                    <div class="c-btn">
+                        <i-button icon="eye" @click="eyeImageNewPicUrl">预览图片</i-button>
+                    </div>
+
+                </Form-item> -->
+                <!-- <Form-item label="新店铺排序" prop="newSortOrder">
+                    <Input-number :min="0" :step="1" v-model="brand.newSortOrder" placeholder="新店铺排序"
+                                  style="width: 188px;"/>
+                </Form-item> -->
+                <Form-item>
+                    <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                    <i-button type="warning" @click="reload" style="margin-left: 8px"/>
+                    返回</i-button>
+                    <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+                </Form-item>
+            </div>
+        </i-form>
+    </Card>
+
+    <div id="loginLayer" style="display: none;height: 100%;">
+        <iframe id="loginfdkk" src="https://www.4dkankan.com/mall_login/login.html" style="height: 100%;width:100%" frameborder="0"></iframe>
+    </div>
+</div>
+
+<script src="${rc.contextPath}/js/shop/brand.js?_${date.systemTime}"></script>
+</body>
+</html>

Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
admins/fd-mall-backstage/js/shop/brand.js


Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
admins/fd-mall-backstage/js/shop/broadcast.js


Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
admins/fd-mall-backstage/js/shop/goods.js


Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
admins/zl-mall-backstage/js/shop/brand.js


Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
admins/zl-mall-backstage/js/shop/broadcast.js


Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
admins/zl-mall-backstage/js/shop/goods.js


+ 5 - 3
js/shop/brand.js

@@ -5134,7 +5134,7 @@ $(function () {
             })
          },
          query: function () {
-             vm.reload();
+             vm.reload(1);
          },
          add: function () {
              vm.showList = false;
@@ -5219,9 +5219,11 @@ $(function () {
                  }
              });
          },
-         reload: function (event) {
+         reload: function (page) {
              vm.showList = true;
-             var page = $("#jqGrid").jqGrid('getGridParam', 'page');
+             if (isNaN(page)) {
+              page = $("#jqGrid").jqGrid('getGridParam', 'page');
+             }
              $("#jqGrid").jqGrid('setGridParam', {
                  postData: {'name': vm.q.name,'type': vm.q.type},
                  page: page

+ 11 - 1
js/shop/broadcast.js

@@ -80,7 +80,8 @@ $(function () {
                 {required: true, message: '直播间标题不能为空', trigger: 'blur'}
             ],
             startTime: [
-                {required: true, name: '直播开始时间',validator: validateNotNullIdCheck,  trigger: 'change'}
+                {required: true, name: '直播开始时间',validator: validateNotNullIdCheck,  trigger: 'change'},
+                {required: true, name: '直播开始时间只能在十分钟后',validator: validateNotNullIdCheck,  trigger: 'change'},
             ],
             endTime: [
                 {required: true, name: '直播结束时间',validator: validateNotNullIdCheck,  trigger: 'change'}
@@ -128,6 +129,15 @@ $(function () {
          },
          saveOrUpdate: function (event) {
              var url = vm.broadcast.slideId == null ? "../liveRoom/add" : "../liveRoom/update";
+             // 判断时间
+             if ((new Date().getTime() + 60000 * 10) >= vm.startTime * 1000) {
+                 alert('开播时间需要在当前时间的10分钟后,并且不能在6 个月后')
+                 return
+             }
+             if ((vm.endTime * 1000 - vm.startTime * 1000 < 30 * 60000) || (vm.endTime * 1000 - vm.startTime * 1000 >= 86400000)) {
+                 alert('开播时间和结束时间间隔不得短于30分钟,不得超过24小时')
+                 return
+             }
              let params = Object.assign({}, vm.broadcast,{
                 startTime:vm.startTime,
                 endTime:vm.endTime

+ 1 - 0
js/shop/goods.js

@@ -304,6 +304,7 @@ var vm = new Vue({
             let tepName = arr.map(function (item) {
                 return item.specificationName
             })
+            console.log(arr, 'arr')
             tepName = []
             arr.forEach(function (item) {
                 if (!~tepName.indexOf(item.specificationName)) {