shish 3 лет назад
Родитель
Сommit
d6251593f1

+ 11 - 3
ghsApp/src/admin/home/me.vue

@@ -19,9 +19,7 @@
 
 
               <view class="top-info_box" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
               <view class="top-info_box" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
                 <view> {{ shopInfo.shopName||'' }}
                 <view> {{ shopInfo.shopName||'' }}
-                <text v-if="shopInfo.shopInfo.default && shopInfo.shopInfo.default == 1" style="background-color:#3385FF;color:white;
-                font-weight:bold;font-size:23upx;border-radius:20upx;margin-left:10upx;padding:3upx 8upx 3upx 8upx;
-                border:1upx solid #3385FF;">默认</text>
+                <text v-if="shopInfo.shopInfo.default && shopInfo.shopInfo.default == 1" class="default-shop">默认</text>
                 </view>
                 </view>
                 <view> <text>{{ shopInfo.sjName||'' }} | ID {{shopInfo.shopId||''}}</text> </view>
                 <view> <text>{{ shopInfo.sjName||'' }} | ID {{shopInfo.shopId||''}}</text> </view>
               </view>
               </view>
@@ -414,6 +412,16 @@ export default {
           display: flex;
           display: flex;
           padding: 40upx 30upx;
           padding: 40upx 30upx;
           align-items: center;
           align-items: center;
+          .default-shop{
+            background-color:#3385FF;
+            color:white;
+            font-weight:bold;
+            font-size:23upx;
+            border-radius:20upx;
+            margin-left:10upx;
+            padding:3upx 8upx 3upx 8upx;
+            border:1upx solid #3385FF;
+          }
           & .top-info_box {
           & .top-info_box {
             padding-left: 30upx;
             padding-left: 30upx;
             & > view:nth-child(1) {
             & > view:nth-child(1) {

+ 2 - 2
ghsApp/src/admin/shop/add.vue

@@ -107,9 +107,9 @@
 				</tui-list-cell>
 				</tui-list-cell>
 
 
 				<tui-list-cell class="line-cell" :hover="false">
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">设为默认</view>
+					<view class="tui-title">默认门店</view>
 					<view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.default == 0 ? false : true" @change="defaultChange" /> {{form.default==0 ? '关闭' : '开启'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.default == 0 ? false : true" @change="defaultChange" /> {{form.default==0 ? '否' : '是'}}
 					</view>
 					</view>
 				</tui-list-cell>
 				</tui-list-cell>
 
 

+ 4 - 5
hdApp/src/admin/home/workbench.vue

@@ -654,7 +654,7 @@ export default {
           margin-top: 5upx;
           margin-top: 5upx;
           .text_8 {
           .text_8 {
             display:inline-block;
             display:inline-block;
-            width: 458upx;
+            width: 550upx;
             height: 38upx;
             height: 38upx;
             color: rgba(51, 51, 51, 1);
             color: rgba(51, 51, 51, 1);
             font-size: 36upx;
             font-size: 36upx;
@@ -663,7 +663,6 @@ export default {
             white-space: nowrap;
             white-space: nowrap;
             line-height:38upx;
             line-height:38upx;
             overflow:hidden;
             overflow:hidden;
-            text-overflow:ellipsis;
           }
           }
           .text_9 {
           .text_9 {
             width: 533upx;
             width: 533upx;
@@ -797,7 +796,7 @@ export default {
         width: 130upx;
         width: 130upx;
         position: absolute;
         position: absolute;
         left: 585upx;
         left: 585upx;
-        top: 98upx;
+        top: 105upx;
         border-radius:39upx;
         border-radius:39upx;
         .text_13 {
         .text_13 {
           color: rgba(255, 255, 255, 1);
           color: rgba(255, 255, 255, 1);
@@ -814,7 +813,7 @@ export default {
         width: 130upx;
         width: 130upx;
         position: absolute;
         position: absolute;
         left: 585upx;
         left: 585upx;
-        top: 98upx;
+        top: 105upx;
         border-radius:39upx;
         border-radius:39upx;
         .text_13 {
         .text_13 {
           color: rgba(255, 255, 255, 1);
           color: rgba(255, 255, 255, 1);
@@ -831,7 +830,7 @@ export default {
         width: 130upx;
         width: 130upx;
         position: absolute;
         position: absolute;
         left: 390upx;
         left: 390upx;
-        top: 98upx;
+        top: 105upx;
         border-radius:39upx;
         border-radius:39upx;
         .text_13 {
         .text_13 {
           color: rgba(255, 255, 255, 1);
           color: rgba(255, 255, 255, 1);

+ 2 - 3
hdApp/src/pagesPurchase/bookProduct.vue

@@ -670,13 +670,12 @@ export default {
         margin-left: 30upx;
         margin-left: 30upx;
         &>.shop_title{
         &>.shop_title{
           margin-top: 14upx;
           margin-top: 14upx;
-          font-size: 36upx;
+          font-size: 34upx;
           font-weight: 600;
           font-weight: 600;
           color: #060606;
           color: #060606;
-		  width: 430upx;
+		  width: 500upx;
 		  overflow: hidden;
 		  overflow: hidden;
 		  white-space: nowrap;
 		  white-space: nowrap;
-		  text-overflow: ellipsis;
 		  .level{
 		  .level{
             margin-left:20upx;
             margin-left:20upx;
             color:white;
             color:white;

+ 2 - 3
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -750,13 +750,12 @@ export default {
         margin-left: 20upx;
         margin-left: 20upx;
         &>.shop_title{
         &>.shop_title{
           margin-top:0upx;
           margin-top:0upx;
-          font-size: 43upx;
+          font-size: 38upx;
           font-weight: 600;
           font-weight: 600;
           color: #060606;
           color: #060606;
-		  width: 430upx;
+		  width: 580upx;
 		  overflow: hidden;
 		  overflow: hidden;
 		  white-space: nowrap;
 		  white-space: nowrap;
-		  text-overflow: ellipsis;
 		  .level{
 		  .level{
             margin-left:20upx;
             margin-left:20upx;
             color:white;
             color:white;

+ 4 - 4
hdApp/src/pagesPurchase/order.vue

@@ -211,7 +211,7 @@ export default {
           margin-top: 5upx;
           margin-top: 5upx;
           .text_8 {
           .text_8 {
             display:inline-block;
             display:inline-block;
-            width: 458upx;
+            width: 550upx;
             height: 38upx;
             height: 38upx;
             color: rgba(51, 51, 51, 1);
             color: rgba(51, 51, 51, 1);
             font-size: 36upx;
             font-size: 36upx;
@@ -354,7 +354,7 @@ export default {
         width: 130upx;
         width: 130upx;
         position: absolute;
         position: absolute;
         left: 585upx;
         left: 585upx;
-        top: 98upx;
+        top: 105upx;
         border-radius:39upx;
         border-radius:39upx;
         .text_13 {
         .text_13 {
           color: rgba(255, 255, 255, 1);
           color: rgba(255, 255, 255, 1);
@@ -371,7 +371,7 @@ export default {
         width: 130upx;
         width: 130upx;
         position: absolute;
         position: absolute;
         left: 585upx;
         left: 585upx;
-        top: 98upx;
+        top: 105upx;
         border-radius:39upx;
         border-radius:39upx;
         .text_13 {
         .text_13 {
           color: rgba(255, 255, 255, 1);
           color: rgba(255, 255, 255, 1);
@@ -388,7 +388,7 @@ export default {
         width: 130upx;
         width: 130upx;
         position: absolute;
         position: absolute;
         left: 390upx;
         left: 390upx;
-        top: 98upx;
+        top: 105upx;
         border-radius:39upx;
         border-radius:39upx;
         .text_13 {
         .text_13 {
           color: rgba(255, 255, 255, 1);
           color: rgba(255, 255, 255, 1);