From 90d9fa96719b6383dcfca8ee5974ffd4ad7af709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 3 Sep 2021 09:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E7=AD=BE=E5=88=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                          |   4 +-
 pages/mine/signIn.vue                  | 105 ++++++++++++++-----------
 pages/navigation/search/searchPage.vue |  12 +--
 3 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0a26d89..88d75a7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__C100675",
     "description" : "",
-    "versionName" : "4.0.34",
-    "versionCode" : 4000034,
+    "versionName" : "4.0.40",
+    "versionCode" : 4000040,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
diff --git a/pages/mine/signIn.vue b/pages/mine/signIn.vue
index 82b2b95..32556bd 100644
--- a/pages/mine/signIn.vue
+++ b/pages/mine/signIn.vue
@@ -1,26 +1,30 @@
 <template>
   <view class="sign-in">
-    <view class="signin-btn-con">
-      <div class="circle-box">
-        <div class="cricle" @click="signIn()">
-          <span v-if="!ifSign" :class="{ active: signFlag || ifSign }">签到</span>
-          <span v-else :class="{ active: signFlag || ifSign }" :style="ifSign ? 'transform: rotateY(0deg);' : ''">已签</span>
+    <view class="date-card">
+      <div class="box">
+        <div class="circle-box">
+          <div class="cricle" @click="signIn()">
+            <span v-if="!ifSign" :class="{ active: signFlag || ifSign }">签到</span>
+            <span v-else :class="{ active: signFlag || ifSign }"
+              :style="ifSign ? 'transform: rotateY(0deg);' : ''">已签</span>
+          </div>
         </div>
+        <text class="tips">坚持每天连续签到可以获多重奖励哦</text>
       </div>
-      <text class="tips">坚持每天连续签到可以获多重奖励哦</text>
     </view>
     <div class="date-card">
       <view class="date-con">
         <view class="date-tit">
-          <u-row style="width: 100%;  justify-content: center;">
-            <div style="text-align: center; " class="text">{{ currentMonth }} {{ currentYear }}</div>
-          </u-row>
+          <div class="current-month">
+            <div class="day">每日记录<span> ({{ currentMonth }})</span></div>
+          </div>
         </view>
         <view class="week">
           <text v-for="item in weekArr" :key="item.id">{{ item }}</text>
         </view>
         <view class="date" v-for="obj in dataObj" :key="obj.id">
-          <view class="item" v-for="item in obj" :key="item.id" :class="item == '' ? 'hide' : ''" :animation="item == currentDay ? animationData : ''">
+          <view class="item" v-for="item in obj" :key="item.id" :class="item == '' ? 'hide' : ''"
+            :animation="item == currentDay ? animationData : ''">
             <view class="just" :class="signArr.indexOf(item) != -1 ? 'active' : ''">
               <view class="top">{{ item }} </view>
               <view class="bottom">
@@ -36,7 +40,7 @@
               ">
               <view class="top">{{ item }}</view>
               <view class="bottom">
-                <u-icon name="checkmark" color="#ff9f28"></u-icon>
+                <u-icon name="checkmark" :color="aiderLightColor"></u-icon>
               </view>
             </view>
           </view>
@@ -50,7 +54,7 @@
         <text class="close" @click="close">×</text>
       </view>
       <view class="mask-con">
-        <u-icon size="120" style="margin: 50rpx 0" color="#ff9f28" name="checkmark"></u-icon>
+        <u-icon size="120" style="margin: 50rpx 0" :color="aiderLightColor" name="checkmark"></u-icon>
         <text class="text">连续签到可获得额外奖励哦！</text>
       </view>
     </view>
@@ -62,7 +66,7 @@ import { sign, signTime } from "@/api/point.js";
 export default {
   data() {
     return {
-  
+      aiderLightColor:this.$aiderLightColor,
       signFlag: false,
       animationData: {},
       maskFlag: false, //
@@ -105,7 +109,6 @@ export default {
     this.getDate();
   },
   methods: {
-
     /**
      * 补0
      */
@@ -116,7 +119,7 @@ export default {
         return "0" + val;
       }
     },
-  
+
     /**
      * 点击签到
      */
@@ -205,7 +208,6 @@ export default {
           Number(itemVal[1]) === Number(this.currentMonthIndex)
         ) {
           this.signArr.push(Number(itemVal[2]));
-         
         }
         if (
           Number(itemVal[0]) === Number(date.getFullYear()) &&
@@ -285,70 +287,79 @@ export default {
   },
 };
 </script>
-
+<style scoped>
+page {
+  background: #f7f7f7;
+}
+</style>
 <style lang="scss" scoped>
 .date-card {
-  padding: 0 40rpx;
+  padding: 0 32rpx;
+  margin: 32rpx 0;
+  box-shadow: 0 4rpx 24rpx 0 rgba($color: #f6f6f6, $alpha: 1);
 }
 .tips {
-  margin-top: 34rpx;
+  margin-top: 54rpx;
+  color: #999;
+  font-size: 24rpx;
+  letter-spacing: 1rpx;
 }
+
 .circle-box {
   width: 200rpx;
   height: 200rpx;
   border-radius: 50%;
-  margin-top: 60rpx;
-  background: #ff9f28;
+  background: $aider-light-color;
+  box-shadow: 0 4rpx 24rpx 0 rgba($color: $aider-light-color, $alpha: 1);
   display: flex;
   justify-content: center; //这个是X轴居中
   align-items: center; //这个是 Y轴居中
+ 
 }
 
 .cricle {
   width: 160rpx;
   height: 160rpx;
   border-radius: 50%;
-  background: #ff9f28;
+  background: $aider-light-color;
   text-align: center;
   line-height: 160rpx;
   color: #fff;
   font-size: 40rpx;
 }
-
-page {
-  background: #fff;
+.current-month {
+  width: 100%;
+  margin: 20rpx 0;
+}
+.box {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding:64rpx 32rpx;
+  background: #fff;
+  border-radius: 20rpx;
 }
-
 .sign-in {
   color: #333;
-  .signin-btn-con {
-    width: 100%;
-    height: 670rpx;
-    background-image: linear-gradient(180deg, #ff6b35, #ff9f28, #ffcc03);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text {
-      color: #fff;
-      font-size: 28rpx;
-      font-weight: 400;
-    }
-  }
-
   .date-con {
     background: #fff;
     min-height: 730rpx;
-    border-radius: 0.8em;
-    border: 1px solid #ededed;
+    border-radius: 20rpx;
     padding: 0 28rpx;
-    transform: translateY(-320rpx);
-    box-shadow: (1px 3px 5px rgba(0, 0, 0, 0.2));
   }
+  .day {
+    font-size: 36rpx;
 
+    > span {
+      font-size: 30rpx;
+      color: #999;
+      margin-left: 20rpx;
+    }
+  }
   .date-tit {
     display: flex;
     justify-content: space-between;
-    margin: 30rpx 0;
+    margin: 0 0 30rpx 0;
   }
 
   .week {
@@ -419,7 +430,7 @@ page {
         }
 
         .top {
-          color: #ff9f28;
+          color: $aider-light-color;
         }
       }
 
@@ -461,7 +472,7 @@ page {
       width: 540rpx;
       height: 130rpx;
       line-height: 130rpx;
-      background: #ff9f28;
+      background: $aider-light-color;
       color: #fff;
       font-size: 40rpx;
       font-weight: 500;
diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue
index 5dc8fa9..b0f9329 100644
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -376,12 +376,7 @@ export default {
      */
     keyword(val) {
       if (val) {
-        let identical = this.hotKeywordList.some((item) => {
-          return item == val;
-        });
-        if (!identical) {
-          this.defaultKeyword = "请输入搜索商品";
-        } else {
+        if (val) {
           this.defaultKeyword = val;
         }
       } else {
@@ -741,11 +736,12 @@ export default {
         keyword = (this.hotKeywordList.length && this.hotKeywordList[0]) || "";
       }
       this.defaultKeyword == "请输入搜索商品" ? (keyword = "") : "";
-      this.keyword = keyword;
+      // this.keyword = keyword;
+      keyword ? (this.keyword = keyword) : "";
       this.saveKeyword(keyword); //保存为历史
       this.isShowSeachGoods = true;
       this.$refs.mSearch.isShowSeachGoods = true;
-      this.params.keyword = keyword;
+      this.params.keyword = this.keyword;
       this.params.pageNumber = 1;
       this.$set(this.sortParams, "keyword", keyword);
       this.loadData("refresh", 1);