Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/wanzb_xcxv2

pages/index/index.wxml

@@ -1,5 +1,5 @@
 <!--index.wxml-->
-<view   class="marquee_container"  wx:if='{{notices.length>0}}'
+<view   class="marquee_container"  
   style="{{'--marqueeWidth--:'+-12*notices.length+'em'}}">
     <view class="zd"></view>
     <image src="../../images/tttz.png" mode="widthFix"></image>

pages/index/index.wxss

@@ -26,6 +26,7 @@
   padding: 12.5px 12px;
   position: relative;
   overflow: hidden;
+  height: 90rpx;
 }
 .marquee_container:hover{
   /* 不起作用 */

pages/style/style.js

@@ -34,20 +34,21 @@ Page({
     })
     $api.getMyStyle().then(res=>{
       var form = res.data.data;
-      form.zq = form.zq.split(',')
-      form.cw = form.cw.split(',')
-      form.df = form.df.split(',')
-      form.pz = form.pz.split(',')
+      form.zq = form.zq?form.zq.split(','):[]
+      form.cw = form.cw?form.cw.split(','):[]
+      form.df = form.df?form.df.split(','):[]
+      form.pz = form.pz?form.pz.split(','):[]
         this.setData({
           form: form
         })
+      console.log(form)
     })
   },
   change(e){
     let value = e.target.dataset.id, item = e.target.dataset.item;
     let form=this.data.form;
     // form[item] = value;
-    console.log(form[item].indexOf(value))
+    // console.log(form[item].indexOf(value))
     if (form[item].indexOf(value)<0){
       form[item].push(value)
     }else{