SanHQin 8 月之前
父节点
当前提交
ad2f785ace

+ 0 - 77
build/webpack.base.conf.js

@@ -11,7 +11,6 @@ function resolve(dir) {
 
 
 module.exports = {
-<<<<<<< HEAD
   context: path.resolve(__dirname, '../'),
   entry: {
     app: './src/main.js'
@@ -84,80 +83,4 @@ module.exports = {
     tls: 'empty',
     child_process: 'empty'
   }
-=======
-	// devServer: {
-	// 	headers: {
-	// 		"Cross-Origin-Opener-Policy": "same-origin", // 保护你的源站点免受攻击
-	// 		"Cross-Origin-Embedder-Policy": "require-corp", // 保护受害者免受你的源站点的影响
-	// 	},
-	// },
-	context: path.resolve(__dirname, '../'),
-	entry: {
-		app: './src/main.js'
-	},
-	output: {
-		path: config.build.assetsRoot,
-		filename: '[name].js',
-		publicPath: process.env.NODE_ENV === 'production'
-			? config.build.assetsPublicPath
-			: config.dev.assetsPublicPath
-	},
-	resolve: {
-		extensions: ['.js', '.vue', '.json'],
-		alias: {
-			'vue$': 'vue/dist/vue.esm.js',
-			'@': resolve('src'),
-		}
-	},
-	module: {
-		rules: [
-			{
-				test: /\.vue$/,
-				loader: 'vue-loader',
-				options: vueLoaderConfig
-			},
-			{
-				test: /\.js$/,
-				loader: 'babel-loader',
-				include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
-			},
-			{
-				test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-				loader: 'url-loader',
-				options: {
-					limit: 10000,
-					name: utils.assetsPath('img/[name].[hash:7].[ext]')
-				}
-			},
-			{
-				test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-				loader: 'url-loader',
-				options: {
-					limit: 10000,
-					name: utils.assetsPath('media/[name].[hash:7].[ext]')
-				}
-			},
-			{
-				test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-				loader: 'url-loader',
-				options: {
-					limit: 10000,
-					name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
-				}
-			}
-		]
-	},
-	node: {
-		// prevent webpack from injecting useless setImmediate polyfill because Vue
-		// source contains it (although only uses it if it's native).
-		setImmediate: false,
-		// prevent webpack from injecting mocks to Node native modules
-		// that does not make sense for the client
-		dgram: 'empty',
-		fs: 'empty',
-		net: 'empty',
-		tls: 'empty',
-		child_process: 'empty'
-	}
->>>>>>> beta
 }

+ 1 - 5
dist/index.html

@@ -32,11 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.e31efb59597d36c1452f20b5ce34799d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0ad6c5648a38a6d1fa8f.js></script><script type=text/javascript src=./static/js/vendor.382e92fdebaf6164bf93.js></script><script type=text/javascript src=./static/js/app.9e2a04109a30de325f5f.js></script></body></html><script>function stopSafari() {
-=======
-    }</style><link href=./static/css/app.17eb751b9afadf56363a771937f446fb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.fb20c44ae8d85d2eb070.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
+    }</style><link href=./static/css/app.f65a8ff1a8be0992061175047423f63b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3fb62e91643ccf3ef432.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.4cb40e6ad0498483661d.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.e31efb59597d36c1452f20b5ce34799d.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.f65a8ff1a8be0992061175047423f63b.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.f65a8ff1a8be0992061175047423f63b.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.4cb40e6ad0498483661d.js


文件差异内容过多而无法显示
+ 0 - 1
dist/static/js/app.4cb40e6ad0498483661d.js.map


文件差异内容过多而无法显示
+ 0 - 1
dist/static/js/app.9e2a04109a30de325f5f.js


文件差异内容过多而无法显示
+ 0 - 1
dist/static/js/app.fb20c44ae8d85d2eb070.js


文件差异内容过多而无法显示
+ 0 - 1
dist/static/js/app.fb20c44ae8d85d2eb070.js.map


+ 0 - 7
dist/static/js/manifest.0ad6c5648a38a6d1fa8f.js

@@ -1,7 +0,0 @@
-<<<<<<<< HEAD:dist/static/js/manifest.0ad6c5648a38a6d1fa8f.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"7da288988865a9378b49",1:"d8d4e9b1fe43bbb0a681",2:"da6498e5ed226bc25eb5",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.0ad6c5648a38a6d1fa8f.js.map
-========
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"4f3b05586c3acc102a54",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.161e82026ac2ae03ab6f.js.map
->>>>>>>> beta:dist/static/js/manifest.161e82026ac2ae03ab6f.js

文件差异内容过多而无法显示
+ 0 - 1
dist/static/js/manifest.0ad6c5648a38a6d1fa8f.js.map


+ 0 - 7
dist/static/js/manifest.161e82026ac2ae03ab6f.js

@@ -1,7 +0,0 @@
-<<<<<<<< HEAD:dist/static/js/manifest.0ad6c5648a38a6d1fa8f.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"7da288988865a9378b49",1:"d8d4e9b1fe43bbb0a681",2:"da6498e5ed226bc25eb5",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.0ad6c5648a38a6d1fa8f.js.map
-========
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"4f3b05586c3acc102a54",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.161e82026ac2ae03ab6f.js.map
->>>>>>>> beta:dist/static/js/manifest.161e82026ac2ae03ab6f.js

文件差异内容过多而无法显示
+ 0 - 1
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 2 - 0
dist/static/js/manifest.3fb62e91643ccf3ef432.js

@@ -0,0 +1,2 @@
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"4f3b05586c3acc102a54",1:"14e8e8c7e44fc858e4a6",2:"da6498e5ed226bc25eb5",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.3fb62e91643ccf3ef432.js.map

文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/manifest.3fb62e91643ccf3ef432.js.map


+ 3 - 3
src/components/pages/appStore/dialog/addAppDialog.vue

@@ -120,7 +120,7 @@ export default {
         nurl: "",
         ntype: "",
         njuri: "1",
-        nstand: "cn",
+        nstand: "hk",
         njson: ""
       },
       rules: {
@@ -149,7 +149,7 @@ export default {
           nurl: "",
           ntype: "",
           njuri: "1",
-          nstand: "cn",
+          nstand: "hk",
           njson: ""
         };
       }
@@ -169,7 +169,7 @@ export default {
         nurl: "",
         ntype: "",
         njuri: "1",
-        nstand: "cn",
+        nstand: "hk",
         njson: ""
       };
       this.loading = false;

+ 4 - 4
src/components/pages/appStore/index.vue

@@ -180,7 +180,7 @@ export default {
         label: "",//应用的标签搜索
         type: this.showType,//应用的类型
         juri: this.selectJuri,//应用权限 1:我的  2:组织内  3:所有人
-        stand: "cn"//cn站还是hk站
+        stand: "hk"//cn站还是hk站
       };
 
       this.ajax
@@ -238,7 +238,7 @@ export default {
             nurl: data.nurl, //app链接
             ntype: data.ntype, //app类型
             njuri: data.njuri, //app权限 1:我的 2:组织 3:所有人
-            nstand: "cn", //语言
+            nstand: "hk", //语言
             njson: "" //其他信息
           }
         ];
@@ -269,7 +269,7 @@ export default {
             nurl: data.nurl, //app链接
             ntype: data.ntype, //app类型
             njuri: data.njuri, //app权限 1:我的 2:组织 3:所有人
-            nstand: "cn", //语言
+            nstand: "hk", //语言
             njson: data.njson //其他信息
 					}
 				]
@@ -296,7 +296,7 @@ export default {
         suserid: this.userId,//用户ID
         sorg: this.org,
         soid: this.oid,
-        sstand: "cn"
+        sstand: "hk"
       };
 
       this.ajax

部分文件因为文件数量过多而无法显示