Merge branch 'sy_kc_0115' into Development

# Conflicts:
#	view/10.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/3.js
#	view/41.js
#	view/42.js
#	view/51.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
#	view/index.html

src/views/home/Index.vue

@@ -111,7 +111,7 @@
                                                 <div class="text boxsiz">
                                                     <p class="t1 boxsiz">{{v.goods_name}}</p>
                                                     <p class="t2">
-                                                        <span class="l">{{v.price}}</span>
+                                                        <span class="l">{{(v.ac_type==6)?v.price_ac:v.price}}</span>
                                                     </p>
                                                 </div>
                                             </template>