修改主题言责

api/user.js

@@ -4,7 +4,8 @@ import request from "@/utils/request";
  * 省市区
  */
 export function district(data) {
-	return request.get("/citys", data, {
+	return request.get("/city_list", data, {
+		// return request.get("/citys", data, {
 		login: false
 	});
 }

assets/css/base.css

@@ -1,2 +1,2 @@
-@charset "UTF-8";.font-color-red{color:#00c17b !important}.bg-color-red{background-color:#00c17b !important}.icon-color{color:#00c17b}.cart-color{color:#00c17b !important;border:1px solid #00c17b !important}.padding20{padding:20rpx}.pad20{padding:0 20rpx}.padding30{padding:30rpx}.pad30{padding:0 30rpx}.acea-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.acea-row.row-middle{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.acea-row.row-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start}.acea-row.row-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end}.acea-row.row-center{-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-right{-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.acea-row.row-left{-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start}.acea-row.row-between{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-around{-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column-around{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.acea-row.row-column-between{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-center-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-between-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.slider-banner{position:relative;width:100%;overflow:hidden}.slider-banner .swiper-container{height:100%}.slider-banner image{display:block;width:100%;height:100%}.start{width:122rpx;height:30rpx;background-image:url("https://h5.yixiang.co/static/images/start.png");background-repeat:no-repeat;-webkit-background-size:122rpx auto;background-size:122rpx auto}.start.star5{background-position:0 3rpx}.start.star4{background-position:0 -30rpx}.start.star3{background-position:0 -70rpx}.start.star2{background-position:0 -105rpx}.start.star1{background-position:0 -140rpx}.start.star0{background-position:0 -175rpx}.checkbox-wrapper{position:relative}.checkbox-wrapper input{display:none}.checkbox-wrapper .icon{position:absolute;left:0;top:50%;display:inline-block;width:18px;height:18px;border:1px solid #cccccc;-webkit-border-radius:50%;border-radius:50%;-webkit-transform:translate(0, -50%);-ms-transform:translate(0, -50%);transform:translate(0, -50%)}.checkbox-wrapper input:checked+.icon{background-color:#e93323;border-color:#e93323;background-image:url("https://h5.yixiang.co/static/images/enter.png");-webkit-background-size:21rpx 15rpx;background-size:21rpx 15rpx;background-repeat:no-repeat;background-position:center center}.Loads{height:80rpx;font-size:25rpx;color:#000}.Loads .iconfont{font-size:30rpx;margin-right:10rpx;height:32rpx;line-height:32rpx}@-webkit-keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.loadingpic{-webkit-animation:load 3s linear 1s infinite;animation:load 3s linear 1s infinite}.loading{-webkit-animation:load linear 1s infinite;animation:load linear 1s infinite}
+@charset "UTF-8";.font-color-red{color:#eb3729 !important}.bg-color-red{background-color:#eb3729 !important}.icon-color{color:#eb3729}.cart-color{color:#eb3729 !important;border:1px solid #eb3729 !important}.padding20{padding:20rpx}.pad20{padding:0 20rpx}.padding30{padding:30rpx}.pad30{padding:0 30rpx}.acea-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.acea-row.row-middle{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.acea-row.row-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start}.acea-row.row-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end}.acea-row.row-center{-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-right{-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.acea-row.row-left{-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start}.acea-row.row-between{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-around{-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column-around{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.acea-row.row-column-between{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-center-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-between-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.slider-banner{position:relative;width:100%;overflow:hidden}.slider-banner .swiper-container{height:100%}.slider-banner image{display:block;width:100%;height:100%}.start{width:122rpx;height:30rpx;background-image:url("https://h5.yixiang.co/static/images/start.png");background-repeat:no-repeat;-webkit-background-size:122rpx auto;background-size:122rpx auto}.start.star5{background-position:0 3rpx}.start.star4{background-position:0 -30rpx}.start.star3{background-position:0 -70rpx}.start.star2{background-position:0 -105rpx}.start.star1{background-position:0 -140rpx}.start.star0{background-position:0 -175rpx}.checkbox-wrapper{position:relative}.checkbox-wrapper input{display:none}.checkbox-wrapper .icon{position:absolute;left:0;top:50%;display:inline-block;width:18px;height:18px;border:1px solid #cccccc;-webkit-border-radius:50%;border-radius:50%;-webkit-transform:translate(0, -50%);-ms-transform:translate(0, -50%);transform:translate(0, -50%)}.checkbox-wrapper input:checked+.icon{background-color:#e93323;border-color:#e93323;background-image:url("https://h5.yixiang.co/static/images/enter.png");-webkit-background-size:21rpx 15rpx;background-size:21rpx 15rpx;background-repeat:no-repeat;background-position:center center}.Loads{height:80rpx;font-size:25rpx;color:#000}.Loads .iconfont{font-size:30rpx;margin-right:10rpx;height:32rpx;line-height:32rpx}@-webkit-keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.loadingpic{-webkit-animation:load 3s linear 1s infinite;animation:load 3s linear 1s infinite}.loading{-webkit-animation:load linear 1s infinite;animation:load linear 1s infinite}
 /*# sourceMappingURL=./base.css.map */

assets/css/base.less

@@ -3,17 +3,17 @@
     *相关初始化
 */
 .font-color-red {
-  color: #00c17b !important;
+  color: #eb3729 !important;
 }
 .bg-color-red {
-  background-color: #00c17b !important;
+  background-color: #eb3729 !important;
 }
 .icon-color {
-  color: #00c17b;
+  color: #eb3729;
 }
 .cart-color {
-  color: #00c17b !important;
-  border: 1px solid #00c17b !important;
+  color: #eb3729 !important;
+  border: 1px solid #eb3729 !important;
 }
 /* padding20 */
 .padding20 {

assets/css/style.less

@@ -55,7 +55,7 @@ page {
 }
 
 #footer .item.on {
-  color: #00c17b;
+  color: #eb3729;
 }
 
 #footer .item .iconfont {
@@ -191,13 +191,13 @@ page {
 
 .promotionGood .item .text .sp-money .moneyCon {
   padding: 0 0.18*100rpx;
-  background-color: #00c17b;
+  background-color: #eb3729;
   height: 0.46*100rpx;
   line-height: 0.46*100rpx;
-  background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%);
+  background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%);
   font-size: 0.2*100rpx;
   color: #fff;
-  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
+  background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
   border-radius: 0.24*100rpx 0.03*100rpx 0.24*100rpx 0.03*100rpx;
 }
 
@@ -615,8 +615,8 @@ page {
 
 .product-window .productWinList .item .listn .itemn.on {
   color: #fff;
-  background-color: #00c17b;
-  border-color: #00c17b;
+  background-color: #eb3729;
+  border-color: #eb3729;
 }
 
 .product-window .cart {
@@ -1066,7 +1066,7 @@ page {
   width: 0.18*100rpx;
   height: 0.18*100rpx;
   border-radius: 50%;
-  background-color: #00c17b;
+  background-color: #eb3729;
   left: 25.5%;
   bottom: 0;
   margin-bottom: -0.09*100rpx;
@@ -1078,7 +1078,7 @@ page {
   width: 0.18*100rpx;
   height: 0.18*100rpx;
   border-radius: 50%;
-  background-color: #00c17b;
+  background-color: #eb3729;
   left: 25.5%;
   top: 0;
   margin-top: -0.09*100rpx;
@@ -1302,13 +1302,13 @@ page {
 
 .index .news .new-banner .text .label {
   font-size: 0.2*100rpx;
-  color: #00c17b;
+  color: #eb3729;
   width: 0.68*100rpx;
   height: 0.34*100rpx;
   border-radius: 0.2*100rpx;
   text-align: center;
   line-height: 0.34*100rpx;
-  border: 0.02*100rpx solid #00c17b;
+  border: 0.02*100rpx solid #eb3729;
 }
 
 .index .news .new-banner .text .newsTitle {
@@ -2212,7 +2212,7 @@ page {
   height: 1*100rpx;
   width: 100%;
   border-radius: 0 0 50% 50%;
-  background-color: #00c17b;
+  background-color: #eb3729;
 }
 
 .user .header .picTxt .pictrue {
@@ -2665,13 +2665,13 @@ page {
 .product-con .footer .bnt .joinCart {
   border-radius: 0.5*100rpx 0 0 0.5*100rpx;
   background-image: linear-gradient(to right, #fea10f 0%, #fea10f 100%);
-  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
+  background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
 }
 
 .product-con .footer .bnt .buy {
   border-radius: 0 0.5*100rpx 0.5*100rpx 0;
-  background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%);
-  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
+  background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%);
+  background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
 }
 
 /*订单提交*/
@@ -2692,7 +2692,7 @@ page {
 }
 
 .order-submission .address .addressCon {
-  width: 6.1*100rpx;
+  width: 5.7*100rpx;
   font-size: 0.26*100rpx;
   color: #666;
 }
@@ -2817,7 +2817,7 @@ page {
 }
 
 .order-submission .wrapper .item .list .payItem .name .iconfont.icon-yinhangqia {
-  background-color: #00c17b;
+  background-color: #eb3729;
 }
 
 .order-submission .wrapper .item .list .payItem .tip {
@@ -2959,7 +2959,7 @@ page {
 }
 
 .address-management .footer .addressBnt.wxbnt {
-  background-color: #00c17b;
+  background-color: #eb3729;
 }
 
 /*添加地址*/
@@ -3033,8 +3033,8 @@ page {
   line-height: 0.86*100rpx;
   margin: 0 auto;
   font-size: 0.32*100rpx;
-  color: #00c17b;
-  border: 1px solid #00c17b;
+  color: #eb3729;
+  border: 1px solid #eb3729;
 }
 
 /*我的订单*/
@@ -3087,7 +3087,7 @@ page {
 
 .my-order .nav .item.on {
   font-weight: bold;
-  border-bottom: 0.05*100rpx solid #00c17b;
+  border-bottom: 0.05*100rpx solid #eb3729;
 }
 
 .my-order .nav .item .num {
@@ -3249,7 +3249,7 @@ page {
 
 .order-details .nav .navCon .on {
   font-weight: bold;
-  color: #00c17b;
+  color: #eb3729;
 }
 
 .order-details .nav .progress {
@@ -3476,7 +3476,7 @@ page {
 }
 
 .logistics .logisticsCon .item .circular.on {
-  background-color: #00c17b;
+  background-color: #eb3729;
 }
 
 .logistics .logisticsCon .item .text {
@@ -3520,7 +3520,7 @@ page {
   color: #fff;
   text-align: center;
   line-height: 1.3*100rpx;
-  text-shadow: 0 4px 0 #00c17b;
+  text-shadow: 0 4px 0 #eb3729;
   border: 0.06*100rpx solid #f5f5f5;
   margin: -0.76*100rpx auto 0 auto;
   background-color: #999;
@@ -3914,7 +3914,7 @@ page {
 }
 
 .member-center .wrapper .title .iconfont {
-  color: #00c17b;
+  color: #eb3729;
   font-weight: normal;
   font-size: 0.4*100rpx;
   margin-right: 0.12*100rpx;
@@ -3927,7 +3927,7 @@ page {
 }
 
 .member-center .wrapper .title .num .current {
-  color: #00c17b;
+  color: #eb3729;
 }
 
 .member-center .wrapper .list .item {
@@ -3946,7 +3946,7 @@ page {
 }
 
 .member-center .wrapper .list .item .top .name {
-  border-left: 0.06*100rpx solid #00c17b;
+  border-left: 0.06*100rpx solid #eb3729;
   padding-left: 0.2*100rpx;
   font-size: 0.28*100rpx;
   color: #282828;
@@ -3973,7 +3973,7 @@ page {
   width: 0;
   height: 100%;
   transition: width 0.6s ease;
-  background-color: #00c17b;
+  background-color: #eb3729;
   border-radius: 0.2*100rpx;
 }
 
@@ -3985,7 +3985,7 @@ page {
 }
 
 .member-center .wrapper .list .item .experience .num {
-  color: #00c17b;
+  color: #eb3729;
 }
 
 .member-center .growthValue {
@@ -4105,7 +4105,7 @@ page {
 /*.integral-details .wrapper .nav .item{text-align:center;width:50%;}*/
 .integral-details .wrapper .nav .item.on {
   background-color: #fff;
-  color: #00c17b;
+  color: #eb3729;
   font-weight: bold;
   border-radius: 0.2*100rpx .2*100rpx 0 0;
 }
@@ -4246,7 +4246,7 @@ page {
 
 .bargain-list .list {
   background-color: #fff;
-  border: 0.06*100rpx solid #00c17b;
+  border: 0.06*100rpx solid #eb3729;
   border-radius: 0.3*100rpx;
   margin: .3*100rpx 0.3*100rpx 0.66*100rpx 0.3*100rpx;
   padding: 0 0.24*100rpx;
@@ -4399,7 +4399,7 @@ page {
 .bargain .bargainGang,
 .bargain .goodsDetails {
   width: 6.6*100rpx;
-  border: 0.06*100rpx solid #00c17b;
+  border: 0.06*100rpx solid #eb3729;
   background-color: #fff;
   border-radius: 0.2*100rpx;
   margin: -1.62*100rpx auto 0 auto;
@@ -4496,8 +4496,8 @@ page {
 }
 
 .bargain .wrapper .bargainBnt.on {
-  border: 0.02*100rpx solid #00c17b;
-  color: #00c17b;
+  border: 0.02*100rpx solid #eb3729;
+  color: #eb3729;
   background-image: linear-gradient(to right, #fff 0%, #fff 100%);
   background-image: -moz-linear-gradient(to right, #fff 0%, #fff 100%);
   width: 100%;
@@ -4579,7 +4579,7 @@ page {
   width: 100%;
   height: 100%;
   border-radius: 50%;
-  border: 0.02px solid #00c17b;
+  border: 0.02px solid #eb3729;
 }
 
 .bargain .bargainGang .list .item .pictxt .text {
@@ -4848,7 +4848,7 @@ page {
   width: 0.54*100rpx;
   background-color: #c6f3e8;
   text-align: center;
-  color: #00c17b;
+  color: #eb3729;
   height: 100%;
   line-height: 0.38*100rpx;
 }
@@ -6324,8 +6324,8 @@ page {
 }
 
 .promoter-list .nav .item.on {
-  color: #00c17b;
-  border-bottom: 0.05*100rpx solid #00c17b;
+  color: #eb3729;
+  border-bottom: 0.05*100rpx solid #eb3729;
 }
 
 .promoter-list .search {
@@ -6536,10 +6536,10 @@ page {
 
 .my-promotion .list .item .iconfont {
   font-size: 0.7*100rpx;
-  /* background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%); */
-  /* background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%); */
+  /* background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%); */
+  /* background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%); */
   margin-bottom: 0.2*100rpx;
-  color: #00c17b
+  color: #eb3729
 }
 
 /*我的账户*/
@@ -6552,8 +6552,8 @@ page {
 .my-account .wrapper .header {
   width: 6.9*100rpx;
   height: 3.3*100rpx;
-  background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%);
-  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
+  background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%);
+  background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
   border-radius: 0.16*100rpx;
   margin: 0 auto;
   color: rgba(255, 255, 255, 0.6);
@@ -7264,8 +7264,8 @@ page {
 
 /*立即注册*/
 .register {
-  background-image: linear-gradient(to bottom, #00c17b 0%, #00c17b 100%);
-  background-image: -moz-linear-gradient(to bottom, #00c17b 0%, #00c17b 100%);
+  background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
+  background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
   width: 100%;
   height: 100vh;
 }
@@ -7477,10 +7477,10 @@ page {
 
 .productSort .aside .item.on {
   background-color: #fff;
-  border-left: 0.04*100rpx solid #00c17b;
+  border-left: 0.04*100rpx solid #eb3729;
   width: 100%;
   text-align: center;
-  color: #00c17b;
+  color: #eb3729;
   font-weight: bold;
 }
 
@@ -8228,7 +8228,7 @@ page {
   height: 3.02*100rpx;
   padding: 0.45*100rpx 0.3*100rpx 0 0.3*100rpx;
   position: relative;
-  // background-color: #00c17b;
+  // background-color: #eb3729;
 
 }
 
@@ -8252,7 +8252,7 @@ page {
   height: 1*100rpx;
   width: 100%;
   border-radius: 0 0 50% 50%;
-  // background-color: #00c17b;
+  // background-color: #eb3729;
 }
 
 .order-index .header .item {

config/index.js

@@ -1,4 +1,5 @@
 
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
-export const VUE_APP_API_URL = 'https://h5api.dayouqiantu.cn/api';
+export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
+// export const VUE_APP_API_URL = 'https://h5api.dayouqiantu.cn/api';
 export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static';

pages.json

@@ -411,7 +411,7 @@
 	},
 	"tabBar": {
 		"color": "#282828",
-		"selectedColor": "#00c17b",
+		"selectedColor": "#eb3729",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"height": "50px",

pages/activity/DargainDetails/index.vue

@@ -570,7 +570,7 @@ export default {
 
 <style lang="less">
 page {
-  background-color: #00c17b;
+  background-color: #eb3729;
 }
 .bargainBnt_hui {
   font-size: 0.3*100rpx;

pages/activity/GoodsBargain/index.vue

@@ -79,6 +79,6 @@ export default {
 
 <style >
 page{
-    background: #00c17b;
+    background: #eb3729;
 }
 </style>

pages/activity/GoodsGroup/index.vue

@@ -64,7 +64,7 @@ export default {
     };
   },
   mounted: function() {
-    // document.querySelector('body').setAttribute('style', 'background-color:#00c17b');
+    // document.querySelector('body').setAttribute('style', 'background-color:#eb3729');
     this.getCombinationList();
   },
   onReachBottom() {

pages/activity/GoodsSeckill/index.vue

@@ -223,11 +223,11 @@ export default {
 
   &.active {
     .time {
-      color: #00c17b;
+      color: #eb3729;
     }
 
     .state {
-      background-color: #00c17b;
+      background-color: #eb3729;
       color: #fff;
       opacity: 1;
       border-radius: 30rpx;

pages/activity/Poster/index.vue

@@ -71,7 +71,7 @@ export default {
 
 <style scoped lang="less">
 page {
-  background-color: #00c17b;
+  background-color: #eb3729;
 }
 .poster-poster {
   height: unset !important;

pages/home/index.vue

@@ -61,7 +61,7 @@
 				</view>
 			</view>
 			<view class="newProducts">
-				<scroll-view scroll-y="false" scroll-x="true">
+				<scroll-view :show-scrollbar="false" scroll-y="false" scroll-x="true">
 					<view class="newProductsScroll">
 						<view @click="goGoodsCon(item)" class="newProductsItem" v-for="(item, likeInfoIndex) in likeInfo" :key="likeInfoIndex">
 							<view class="img-box">
@@ -101,7 +101,7 @@
 				</view>
 			</view>
 			<view class="newProducts">
-				<scroll-view scroll-y="false" scroll-x="true">
+				<scroll-view :show-scrollbar="false" scroll-y="false" scroll-x="true">
 					<view class="newProductsScroll">
 						<view @click="goGoodsCon(item)" class="newProductsItem" v-for="(item, firstListIndex) in firstList" :key="firstListIndex">
 							<view class="img-box">
@@ -246,8 +246,10 @@
 				that.$set(that, 'menus', res.data.menus);
 				that.$set(that, 'roll', res.data.roll);
 				that.$set(that, 'activity', res.data.activity);
+				if(res.data.activity){
 				var activityOne = res.data.activity.shift();
 				that.$set(that, 'activityOne', activityOne);
+				}
 				that.$set(that, 'info', res.data.info);
 				that.$set(that, 'firstList', res.data.firstList);
 				that.$set(that, 'bastList', res.data.bastList);

pages/order/OrderSubmission/index.vue

@@ -205,13 +205,13 @@
 
 .order-submission .allAddress {
   width: 100%;
-  background-image: linear-gradient(to bottom, #00c17b 0%, #00c17b 100%);
+  background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
   background-image: -webkit-linear-gradient(
     to bottom,
-    #00c17b 0%,
-    #00c17b 100%
+    #eb3729 0%,
+    #eb3729 100%
   );
-  background-image: -moz-linear-gradient(to bottom, #00c17b 0%, #00c17b 100%);
+  background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
   padding-top: 1 * 100rpx;
 }
 
@@ -279,9 +279,10 @@
 }
 
 .order-submission .allAddress .address {
-  width: 7.1 * 100rpx;
+  width: 6.91 * 100rpx;
   height: 1.5 * 100rpx;
   margin: 0 auto;
+  box-sizing: border-box;
 }
 
 .order-submission .allAddress .line {

pages/orderAdmin/OrderCancellation/index.vue

@@ -157,9 +157,9 @@ export default {
   width: 5.8 * 100rpx;
   height: 0.86 * 100rpx;
   border-radius: 0.43 * 100rpx;
-  background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%);
-  background-image: -webkit-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
-  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
+  background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%);
+  background-image: -webkit-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
+  background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
   text-align: center;
   line-height: 0.86 * 100rpx;
   margin: 0.55 * 100rpx auto 0 auto;

pages/shop/GoodsCon/index.vue

@@ -754,7 +754,7 @@ export default {
 }
 .product-con .store-info .info .picTxt .addressBox .addressTxt {
   font-size: 0.24 * 100rpx;
-  color: #00c17b;
+  color: #eb3729;
 }
 
 .product-con .store-info .praise {
@@ -842,7 +842,7 @@ export default {
 }
 
 .footer .icon-shoucang1 {
-  color: #00c17b;
+  color: #eb3729;
 }
 
 .product-con .product-intro .conter view {

pages/user/Recharge/index.vue

@@ -193,7 +193,7 @@ export default {
   display: none;
 }
 .pic-box-color-active {
-  background-color: #00c17b !important;
+  background-color: #eb3729 !important;
   color: #fff !important;
 }
 .picList {
@@ -288,7 +288,7 @@ export default {
 .payment-top {
   width: 100%;
   height: 3.5 * 100rpx;
-  background-color: #00c17b;
+  background-color: #eb3729;
 }
 .payment-top .name {
   font-size: 0.26 * 100rpx;

pages/user/User/index.vue

@@ -369,14 +369,14 @@ export default {
 .order-status-num {
   min-width: 0.33 * 100rpx;
   background-color: #fff;
-  color: #00c17b;
+  color: #eb3729;
   border-radius: 15px;
   position: absolute;
   right: -0.14 * 100rpx;
   top: -0.15 * 100rpx;
   font-size: 0.2 * 100rpx;
   padding: 0 0.08 * 100rpx;
-  border: 1px solid #00c17b;
+  border: 1px solid #eb3729;
 }
 
 .pictrue {

pages/user/address/AddAddress/index.vue

@@ -97,6 +97,9 @@ export default {
     // document.title = !id ? "添加地址" : "修改地址";
     this.getUserAddress();
     district().then(res => {
+      // city_list 市
+      // county_list 区
+      // province_list 省
       this.districts = res.data;
     });
   },