Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/setup/basicSetUp.vue

@@ -230,9 +230,7 @@
                       <el-slider v-model="msg.MinBackClarity"></el-slider>
                     </el-col>
                     <el-col class="userinfo" :span="7" style="margin-left: 4.16667%;">
-                      <el-input v-model="msg.MinBackClarity" type="number">
-                        <template slot="append">%</template>
-                      </el-input>
+                      <el-input-number v-model="msg.MinBackClarity" controls-position="right" :min="0" :max="100"></el-input-number>
                     </el-col>
                   </el-row>
 
@@ -244,9 +242,7 @@
                       <el-slider v-model="msg.MinBackCircularBead" :min="0" :max="36"></el-slider>
                     </el-col>
                     <el-col class="userinfo" :span="7" style="margin-left: 4.16667%;">
-                      <el-input v-model="msg.MinBackCircularBead" type="number" :min="0" :max="36">
-                        <template slot="append">px</template>
-                      </el-input>
+                      <el-input-number v-model="msg.MinBackCircularBead" controls-position="right" :min="0" :max="36"></el-input-number>
                     </el-col>
                   </el-row>
                 </el-form-item>
@@ -279,9 +275,9 @@
             <div style="width: 50%; padding-left: 100px; zoom: 0.5;">
               <div style="width: 750px; border: 1px solid rgb(238, 238, 238);position: relative">
                 <img src="../../assets/img/heads.png"  alt="" style="width: 750px;">
-                <div class="Mintips" >
+                <div class="Mintips" :style="{opacity: msg.MinBackClarity/100,borderRadius:msg.MinBackCircularBead+'px'}">
                   <img src="../../assets/img/fork_white.png" alt="" style="width: 72px;height: 72px">
-                  <span style="color: white;padding: 0 10px">{{msg.MinTips}}</span>
+                  <span style="padding: 0 10px" >{{msg.MinTips}}</span>
                 </div>
                 <div class="triangle-up">
 
@@ -361,9 +357,9 @@
           AfterTime: '',
           PayWay: [],
           DeliverWay: [],
-          BalanceFun: '',
+          BalanceFun: false,
           ConsultWay: [],
-          MinSwitch: '',
+          MinSwitch: false,
           MinBackColor: '#000000',
           MinBackClarity: 100,
           MinBackCircularBead: 36,
@@ -372,7 +368,7 @@
           MinIcoColor: 1,
           MinShareTitle: '',
           MinShareIco: '',
-          BuySwitch: '',
+          BuySwitch: false,
           CarouselOrder: 0,
           ListShopCar: '',
           ListBuyCount: '',

src/router/index.js

@@ -36,9 +36,9 @@ export default new Router({
       component: resolve => require(['@/components/setUp/basicSetUp'], resolve),
     },
     {
-      path: '/main',
-      name: 'main',
-      component: resolve => require(['@/components/main'], resolve),
+      path: '/mall',
+      name: 'mall',
+      component: resolve => require(['@/components/mall'], resolve),
       children:[
         {
           path: '/zanIndex',