fix：修改上传和样式

a116fc47 · 无尘 · ae1e52ba · a116fc47 · a116fc47 · ae1e52ba
Commit a116fc47 authored Dec 12, 2019 by 无尘
17 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.d9aa64dc698f0f1ffb954f820ebc92f2.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.14.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.b88981ecd4cc1d6f9ab4.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.1bf17e59b55846403e62.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.85dba4a9acffbe4f77c65f47a4128f8d.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.14.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.204ab4f0c0afd0ea3a10.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.1bf17e59b55846403e62.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.85dba4a9acffbe4f77c65f47a4128f8d.css
+++ b/dist/static/css/app.85dba4a9acffbe4f77c65f47a4128f8d.css
--- a/dist/static/css/app.d9aa64dc698f0f1ffb954f820ebc92f2.css
+++ b/dist/static/css/app.d9aa64dc698f0f1ffb954f820ebc92f2.css
--- a/dist/static/css/public.css
+++ b/dist/static/css/public.css
@@ -718,6 +718,10 @@ i {
  font-weight: 600;
 }

+.font-w-700 {
+  font-weight: 700;
+}
+
 .pointer {
  cursor: pointer;
 }

--- a/dist/static/js/2.2b5ea966b27a278d09dd.js
+++ b/dist/static/js/2.2b5ea966b27a278d09dd.js
--- a/dist/static/js/2.c6c3d65ffa36bc7f978d.js
+++ b/dist/static/js/2.c6c3d65ffa36bc7f978d.js
--- a/dist/static/js/3.0cfd0526b069ec9f2abf.js
+++ b/dist/static/js/3.0cfd0526b069ec9f2abf.js
--- a/dist/static/js/manifest.b88981ecd4cc1d6f9ab4.js
+++ b/dist/static/js/manifest.b88981ecd4cc1d6f9ab4.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15: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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"2b5ea966b27a278d09dd",3:"0cfd0526b069ec9f2abf",4:"514ca49e10b89d0f4177",5:"c363a570a348c211247e",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,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}}([]);
\ No newline at end of file
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15: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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"c6c3d65ffa36bc7f978d",3:"4e3a647138bb6f261cd0",4:"514ca49e10b89d0f4177",5:"c363a570a348c211247e",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,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}}([]);
\ No newline at end of file
--- a/src/components/active-config/configs/competition-award.vue
+++ b/src/components/active-config/configs/competition-award.vue
@@ -789,7 +789,7 @@ export default {
        -moz-transform: translateY(-10px);
        -o-transform: translateY(-10px);
        transform: translateY(-10px);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0 rgba(174, 181, 189, 0.5);
      }
      &:first-child {
        margin-left: 0;

--- a/src/components/active-config/configs/consume-config.vue
+++ b/src/components/active-config/configs/consume-config.vue
@@ -385,7 +385,7 @@ export default {
        -moz-transform: translateY(-10px);
        -o-transform: translateY(-10px);
        transform: translateY(-10px);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0 rgba(174, 181, 189, 0.5);
      }
      &:first-child {
        margin-left: 0;

--- a/src/components/active-config/configs/entry-award.vue
+++ b/src/components/active-config/configs/entry-award.vue
@@ -592,7 +592,7 @@ export default {
        -moz-transform: translateY(-10px);
        -o-transform: translateY(-10px);
        transform: translateY(-10px);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0 rgba(174, 181, 189, 0.5);
      }
      &:first-child {
        margin-left: 0;

--- a/src/components/active-config/configs/fraud-control.vue
+++ b/src/components/active-config/configs/fraud-control.vue
@@ -343,7 +343,7 @@ export default {
        -moz-transform: translateY(-10px);
        -o-transform: translateY(-10px);
        transform: translateY(-10px);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0 rgba(174, 181, 189, 0.5);
      }
      &:first-child {
        margin-left: 0;

--- a/src/components/active-config/configs/spot-award.vue
+++ b/src/components/active-config/configs/spot-award.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-21 16:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-11 11:47:10
+ * @LastEditTime: 2019-12-12 10:02:56
 -->
 <!--
 <spot-award></spot-award>
@@ -570,7 +570,7 @@ export default {
        -moz-transform: translateY(-10px);
        -o-transform: translateY(-10px);
        transform: translateY(-10px);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0 rgba(174, 181, 189, 0.5);
      }
      &:first-child {
        margin-left: 0;

--- a/src/components/active-config/reward-config.vue
+++ b/src/components/active-config/reward-config.vue
@@ -1908,7 +1908,7 @@ export default {
        -moz-transform: translateY(-10px);
        -o-transform: translateY(-10px);
        transform: translateY(-10px);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0 rgba(174, 181, 189, 0.5);
      }
      &:first-child {
        margin-left: 0;
@@ -1985,7 +1985,7 @@ export default {
      }
      &.li-cell-active {
        background: linear-gradient(63deg, #357bdf 0%, #72b4fb 100%);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0 rgba(174, 181, 189, 0.5);
        border-radius: 4px;
        border: none;
        .li-cell-inner {

--- a/src/components/active/active-select.vue
+++ b/src/components/active/active-select.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-13 16:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-11 11:44:45
+ * @LastEditTime: 2019-12-12 10:13:00
 -->
 <!--
 <active-select></active-select>
@@ -15,7 +15,7 @@ import activeSelect from '@/components/active/active-select.vue';
 <template>
  <div class="active-select border-box">
    <div class="active-select-title font-22 color-303133 font-w-600">请选择您的活动目的</div>
-    <ul class="flex flex-space-between">
+    <ul class="flex flex-pack-center">
      <template v-for="(item, index) in firstData">
        <li
          :class="['li-cell flex-1 ', firstGoal.goalId == item.goalId ? 'li-cell-active' : '']"
@@ -59,7 +59,7 @@ import activeSelect from '@/components/active/active-select.vue';
                <img
                  :src="secondGoal.goalId == item.goalId ? item.selectedIconUrl : item.iconUrl"
                  alt=""
-                /><span class="p-l-15 font-18 color-303133">{{ item.goalName }}</span>
+                /><span class="p-l-15 font-18 color-303133 font-w-700">{{ item.goalName }}</span>
              </div>
              <div class="li-cell-bottom border-box">
                <div class="li-cell-scene">
@@ -98,7 +98,7 @@ import activeSelect from '@/components/active/active-select.vue';
            <div class="li-cell-inner border-box">
              <div class="li-cell-path_img flex flex-pack-center flex-pack--center">
                <img
-                  :src="item.check ? item.selectedIconUrl : item.iconUrl"
+                  :src="item.iconUrl"
                  alt=""
                />
              </div>
@@ -827,7 +827,7 @@ export default {
        -moz-transform: translateY(-10px);
        -o-transform: translateY(-10px);
        transform: translateY(-10px);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0px rgba(174, 181, 189, 0.5);
      }
      &:first-child {
        margin-left: 0;
@@ -898,7 +898,7 @@ export default {
      }
      &.li-cell-active {
        background: linear-gradient(63deg, #357bdf 0%, #72b4fb 100%);
-        box-shadow: 0px 2px 10px 0px rgba(58, 127, 178, 0.5);
+        box-shadow: 0px 2px 10px 0px rgba(174, 181, 189, 0.5);
        border-radius: 4px;
        border: none;
        .li-cell-inner {

--- a/src/components/single-upload.vue
+++ b/src/components/single-upload.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-20 13:44:22
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-06 11:21:16
+ * @LastEditTime: 2019-12-12 10:07:03
 -->
 <!--
  单个上传组件
@@ -164,7 +164,8 @@ export default {
                that.$message.error(`图片宽度必须≥${that.width}px,宽高比≤${that.limitRate}!`);
                reject();
              }
-              if (that.limitFlag == 3 && (width < that.width || width/height != 5/4) ){
+              console.log(width/height > 5/4)
+              if (that.limitFlag == 3 && (width < that.width || width/height > 5/4) ){
                that.$message.error(`图片宽度必须≥${that.width}px,宽高比≤5/4!`);
                reject();
              }

--- a/static/css/public.css
+++ b/static/css/public.css
@@ -718,6 +718,10 @@ i {
  font-weight: 600;
 }

+.font-w-700 {
+  font-weight: 700;
+}
+
 .pointer {
  cursor: pointer;
 }