Merge branch 'newsh' into redesign‌-260706

ghsApp/src/admin/home/login.vue

@@ -119,7 +119,7 @@
 						</text>
 					</view>
 					<button
-						class="login-btn login-btn--weixin"
+						class="login-btn login-btn--primary"
 						open-type="getPhoneNumber"
 						@getphonenumber="wxPhoneLogin"
 					>手机号一键登录</button>
@@ -813,8 +813,8 @@ export default {
 
 .login-btn--weixin {
   color: #fff;
-  background: #2ba245;
-  box-shadow: 0 10upx 24upx rgba(43, 162, 69, 0.2);
+  background: linear-gradient(90deg, #3385ff 0%, #33b0ff 100%);
+  box-shadow: 0 10upx 24upx rgba(51, 133, 255, 0.24);
 }
 
 .login-agreement {

ghsApp/src/admin/home/workbench.vue

@@ -55,7 +55,7 @@
               <text class="guest-card-desc">前往花掌柜选购花材</text>
             </view>
           </view>
-          <button class="guest-card-btn guest-card-btn--outline" @click="buyItem()">去买花</button>
+          <button class="guest-card-btn guest-card-btn--primary" @click="buyItem()">去买花</button>
         </view>
         <!-- #endif -->
 

hdApp/src/admin/ghsProduct/components/sel-popup.vue

@@ -224,6 +224,7 @@ export default {
   .tui-attr-title {
     padding: 10upx 0;
     color: #333;
+    font-size: 36upx;
   }
 
   .tui-attr-box {
@@ -270,7 +271,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 20upx 0 30upx 0;
+    padding: 20upx 0 65upx 0;
     box-sizing: border-box;
 
     .custom-step-box {