Merge branch 'feature/goods' into 'master'

Feature/goods

See merge request !17

src/api/detail.rate.mock.js

@@ -20,19 +20,19 @@ export default [
   },
   {
     title: "一次交清",
-    age: ["0-1", "2-17", "18-20", "21-25", "26-30", "31-35", "36-40", "41-45", "46-50", "51-55", "56-60", "61-65", "66-70", "71-75", "76-80", "81-85", "86-90", "91-95", "96-99"],
+    age: ["0-1", "2-17", "18-20", "21-25", "26-30", "31-35", "36-40", "41-45", "46-50", "51-55", "56-60"],
     list: [
       [
-        [334, 213, 252, 281, 373, 556, 939, 1582, 2724, 4616, 7176, 10505, 15247, 22582, 34031, 49350, 68806, 91974, 120048],
-        [285, 189, 232, 319, 503, 818, 1229, 1800, 2473, 3416, 4916, 7650, 13398, 21368, 32216, 46892, 64195, 83506, 105165]
+        [334, 213, 252, 281, 373, 556, 939, 1582, 2724, 4616, 7176],
+        [285, 189, 232, 319, 503, 818, 1229, 1800, 2473, 3416, 4916]
       ],
       [
-        [223, 142, 168, 187, 248, 371, 626, 1055, 1816, 3077, 4784, 7003, 10165, 15055, 22687, 32900, 45871, 61316, 80032],
-        [190, 126, 155, 213, 335, 545, 819, 1200, 1648, 2277, 3277, 5100, 8932, 14245, 21477, 31261, 42797, 55671, 70110]
+        [223, 142, 168, 187, 248, 371, 626, 1055, 1816, 3077, 4784],
+        [190, 126, 155, 213, 335, 545, 819, 1200, 1648, 2277, 3277]
       ],
       [
-        [111, 71, 84, 94, 124, 185, 313, 527, 908, 1539, 2392, 3502, 5082, 7527, 11344, 16450, 22935, 30658, 40016],
-        [95, 63, 77, 106, 168, 273, 410, 600, 824, 1139, 1639, 2550, 4466, 7123, 10739, 15631, 21398, 27835, 35055]
+        [111, 71, 84, 94, 124, 185, 313, 527, 908, 1539, 2392],
+        [95, 63, 77, 106, 168, 273, 410, 600, 824, 1139, 1639]
       ]
     ]
   }

src/components/GoodList/index.vue

@@ -31,7 +31,7 @@
               <small>{{ it.sub || "-" }}</small>
               <div class="goods-list-item-price">
                 <span class="goods-list-item-price-amount">¥{{ it.price || "--" }}</span>
-                <span class="goods-list-item-price-unit" v-if="it.unit">{{ it.unit }}/月起</span>
+                <span class="goods-list-item-price-unit" v-if="it.unit">{{ it.unit }}</span>
               </div>
             </cr-col>
           </cr-row>

src/style/var.less

-@deep: ~">>>";
-
 // Color Palette
 @black: #333333;
 @white: #fff;

src/views/Goods/modules/ProtocolIframe.vue

@@ -91,7 +91,7 @@ export default {
   }
   &-head {
     position: absolute;
-    top: 0;
+    top: -1px;
     left: 0;
     width: 100%;
   }

src/views/Goods/plan.vue

@@ -12,7 +12,7 @@
         {{ item.url }}
       </a>
     </card>
-    <protocol-iframe v-model="popupShow" :title="pupopData.title" :content="pupopData.list" />
+    <protocol-iframe v-model="popupShow" :title="pupopData.title" :url="pupopData.path" />
   </div>
 </template>
 <script>
@@ -36,10 +36,10 @@ export default {
   computed: {
     pupopData() {
       const { detail, currentPupopIndex } = this;
-      const { title, list } = detail[currentPupopIndex] || { title: "", list: "" };
+      const { title, path } = detail[currentPupopIndex] || { title: "", path: "" };
       return {
         title: title.substring(0, title.length - 3),
-        list
+        path
       };
     }
   },

src/views/Introduction/modules/BusinessQuali.vue

@@ -11,13 +11,13 @@
     <div class="itd-quali-item">
       <p class="itd-quali-item-title">2. 注册资本</p>
       <div class="itd-quali-item-content">
-        人民币伍仟万元
+        人民币伍仟贰佰万元
       </div>
     </div>
     <div class="itd-quali-item">
       <p class="itd-quali-item-title">3. 成立时间</p>
       <div class="itd-quali-item-content">
-        2006年2月10日
+        2005年12月06日
       </div>
     </div>
     <div class="itd-quali-item">

src/views/User/index.less

@@ -281,11 +281,11 @@
       padding: 1px 0;
       line-height: normal;
 	  text-align: center;
-	  background: @user-module-background-color;
+	  background: @orange-light;
       border-radius: @border-radius-md;
 	  font-size: @font-size-11;
 	  font-weight: 400;
-	  color: #CCCCCC;
+	  color: @black;
   	}
   }
 }