Skip to content

I
integral-mall
Commit 9c030834 by caoyanzhi
Options

Merge branch 'bugfix/上架规则bug' into dev 

# Conflicts:
#	dist/css/main.0af6ded055f9b2390de2.css
#	dist/css/main.0c4ce4cb3723cdc64cb3.css
#	dist/css/main.ecf51f52c8fb29b9cc72.css
#	dist/index.html
#	dist/js/main.1ef0011459739b12af0f.js
#	dist/js/main.1ef0011459739b12af0f.js.LICENSE.txt
#	dist/js/main.5bbcbabac17ea21059e2.js
#	dist/js/main.5bbcbabac17ea21059e2.js.LICENSE.txt
#	dist/js/main.ed25deb121284846317b.js
#	dist/js/main.ed25deb121284846317b.js.LICENSE.txt
parents b03bb90a bd611813
Showing with 36 additions and 3 deletions
dist/css/main.0af6ded055f9b2390de2.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/index.html
<<<<<<< HEAD
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.5bbcbabac17ea21059e2.js"></script><link href="/integral-mall/css/main.ecf51f52c8fb29b9cc72.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
=======
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.ed25deb121284846317b.js"></script><link href="/integral-mall/css/main.0af6ded055f9b2390de2.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
>>>>>>> bugfix/上架规则bug
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
......
dist/js/main.5bbcbabac17ea21059e2.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.ed25deb121284846317b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.ed25deb121284846317b.js.LICENSE.txt 0 → 100644
/*!
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* @version v4.2.6+9869a4bc
*/
/*!
* clipboard.js v2.0.1
* https://zenorocha.github.io/clipboard.js
*
* Licensed MIT © Zeno Rocha
*/
/*!
* vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
* Released under the MIT License.
* https://vue-treeselect.js.org/
*/
/**!
* Sortable 1.10.2
* @author RubaXa <trash@rubaxa.org>
* @author owenm <owen23355@gmail.com>
* @license MIT
*/
src/components/ruleDetail.vue
......@@ -268,9 +268,11 @@ export default {
this.submitRequest();
});
} else {
this.ruleForm.filterJson = '';
this.ruleForm.searchJson = '';
this.ruleForm.searchId = '';
if (this.isAdd) {
this.ruleForm.filterJson = '';
this.ruleForm.searchJson = '';
this.ruleForm.searchId = '';
}
this.submitRequest();
}
} else if (this.ruleForm.memberType == 4) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment