Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

App.vue

@@ -19,12 +19,11 @@ export default {
   },
   methods: {
     init() {
-      console.log(uni.getStorageSync("basedata"));
-      // if (uni.getStorageSync("basedata")) {
-      //   this.basedata = uni.getStorageSync("basedata");
-      //   this.formatTabbar();
-      //   this.formatNavigation();
-      // } else {
+      if (uni.getStorageSync("basedata")) {
+        this.basedata = uni.getStorageSync("basedata");
+        this.formatTabbar();
+        this.formatNavigation();
+      } else {
       this.request2(
         {
           url: "/api/Mall/GetHome",
@@ -33,15 +32,13 @@ export default {
         (res) => {
           uni.setStorageSync("basedata", res.data);
           this.basedata = res.data;
-          console.log("赋值：")
-          console.log(res.data.mall.setting.mallStyle.main)
           this.$uiConfig.mainColor=res.data.mall.setting.mallStyle.main
           this.$uiConfig.secondary=res.data.mall.setting.mallStyle.secondary
           this.formatTabbar();
           this.formatNavigation();
         }
       );
-      //}
+     }
     },
     formatPlat() {
       let modelmes = uni.getSystemInfoSync().model;

pages/coupon/index/index.vue

@@ -338,6 +338,7 @@ export default {
   color: #000;
 }
 .couponStyle  .item .detail .coupond .date {
+	font-family: '23';
   margin-top: 5px;
   font-size: 12px;
   color: #777;

pages/coupon/list/list.vue

@@ -38,7 +38,7 @@
 			  </view>
 			  <view class="item_b">
 				  <Text v-if='x.IndateType==1'>领券后{{x.IndateDay}}天过期</Text>
-				  <Text v-if='x.IndateType==2'>有效日期{{x.StartDate}}-{{x.EndDate}}</Text>
+				  <Text v-if='x.IndateType==2'>有效日期:{{x.StartDate}}-{{x.EndDate}}</Text>
 				  <!-- <Text class="top_title" >{{x.UseTypeStr}}</Text> -->
 				  <Text class='top_title' v-if='x.UseType==1'>适用类别: <Text v-for="(item, index) in x.ProductList" :key="index">{{item.Relevance}}</Text> </Text>
 				  <Text class='top_title' v-if='x.UseType==2'>适用商品: <Text v-for="(item, index) in x.ProductList" :key="index">{{item.Relevance}}</Text> </Text>
@@ -237,6 +237,7 @@ export default {
 	
 }
 .couponlistStyle .item_b{
+	font-family: '213';
 	width: 100%;
 	height: 60px;
 	display: flex;
@@ -244,7 +245,7 @@ export default {
 	padding: 10px;
 	background-color: #fff;
 	justify-content: space-around;
-	font-size: 14px;
+	font-size: 12px;
 	position: relative;
 	
 }

pages/index/index.vue

@@ -166,11 +166,9 @@ export default {
             },
           },
           (res) => {
-			 console.log(res,'resIndex');
             this.indexPageData = res.data.home_pages.navs[0].template.data;
 			this.myPageData=res.data;
-		 
-            // wx.setStorageSync("indexdata", this.myPageData);
+			uni.setStorageSync("basedata", res.data);
             if (res.data.home_pages.title != "") {
               uni.setNavigationBarTitle({
                 title: res.data.home_pages.title,