Merge remote-tracking branch 'origin/main'

yudao-mall-uniapp-master/.env.development

@@ -1,2 +1,2 @@
  # SHOPRO_DEV_BASE_URL = https://yanghaodong.51vip.biz
- SHOPRO_DEV_BASE_URL = http://192.168.1.129:48080
+ SHOPRO_DEV_BASE_URL = http://192.168.1.118:48080

yudao-mall-uniapp-master/pages.json

@@ -683,7 +683,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "芋道商城",
+		"navigationBarTitleText": "郑大钒水",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF",
 		"navigationStyle": "custom"

yudao-mall-uniapp-master/sheep/components/s-search-block/s-search-block.vue

@@ -30,12 +30,12 @@
     />
     <view class="keyword-link ss-flex">
       <view v-for="(item, index) in data.hotKeywords" :key="index">
-        <view
+        <!-- <view
           class="ss-m-r-16"
           :style="[{ color: data.textColor }]"
           @tap.stop="sheep.$router.go('/pages/goods/list', { keyword: item })"
           >{{ item }}</view
-        >
+        > -->
       </view>
     </view>
     <view v-if="data.hotKeywords && data.hotKeywords.length && navbar" class="ss-flex">

yudao-mall-uniapp-master/sheep/config/index.js

@@ -7,7 +7,7 @@ if (process.env.NODE_ENV === 'development') {
   baseUrl = import.meta.env.SHOPRO_BASE_URL;
 }
 version = import.meta.env.SHOPRO_VERSION;
-console.log(`[芋道商城 ${version}]  http://doc.iocoder.cn`);
+console.log(`[郑大钒水 ${version}]  http://doc.iocoder.cn`);
 
 export const apiPath = import.meta.env.SHOPRO_API_PATH;
 export const staticUrl = import.meta.env.SHOPRO_STATIC_URL;

yudao-mall-uniapp-master/sheep/store/app.js

@@ -61,10 +61,10 @@ const app = defineStore({
       // TODO 芋艿：未来支持管理后台可配；对应 https://api.shopro.sheepjs.com/shop/api/init
       if (true) {
         this.info = {
-          name: '芋道商城',
+          name: '郑大钒水',
           logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
           version: '1.1.13',
-          copyright: '全部开源，个人与企业可 100% 免费使用',
+          copyright: '超牛的',
           copytime: 'Copyright© 2018-2024',
 
           cdnurl: 'https://file.sheepjs.com', // 云存储域名