Merge branch 'main' of http://hmgit.huamar.com:8881/zhangshengli/yshi

fuintAdmin/.env.development

@@ -1,14 +1,15 @@
 # 页面标题
-VUE_APP_TITLE = 会员演示营销管理系统
+VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店
 
 # 开发环境配置
 ENV = 'development'
 
-# 会员演示营销系统/开发环境
+# 李学武牡丹瓷官方旗舰店/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 发布目录
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://127.0.0.1:8999/'
+#VUE_APP_SERVER_URL = 'http://127.0.0.1:8999/'
+VUE_APP_SERVER_URL = 'http://192.168.10.70:8999/'

fuintAdmin/.env.production

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 会员演示营销管理系统
+VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店
 
 # 生产环境配置
 ENV = 'production'
 
-# 会员演示营销系统/生产环境
+# 李学武牡丹瓷官方旗舰店/生产环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 发布目录

fuintAdmin/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 会员演示营销管理系统
+VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店
 
 # 测试环境配置
 ENV = 'staging'
 
-# 会员演示营销系统/测试环境
+# 李学武牡丹瓷官方旗舰店/测试环境
 VUE_APP_BASE_API = '/stage-api'
 
 # 发布目录

fuintAdmin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fuintAdmin",
   "version": "3.0.3",
-  "description": "会员演示营销系统后台管理端",
+  "description": "李学武牡丹瓷官方旗舰店",
   "author": "FSQ",
   "license": "MIT",
   "scripts": {

fuintAdmin/src/views/login.vue

@@ -65,7 +65,9 @@
           </el-form-item>
          </el-form>
          <div class="copy-right">
-           <span>Copyright © 2022-2024 <a class="link" href="https://www.baidu.com">演示</a> All Rights Reserved.</span>
+           <span>华码科技 © 2022-2024
+<!--             <a class="link" href="https://www.baidu.com">演示</a>-->
+             All Rights Reserved.</span>
           </div>
       </div>
   </div>

fuintAdmin/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '会员演示营销管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '李学武牡丹瓷官方旗舰店' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 81 // 端口
 

fuintUniapp/config.js

@@ -3,7 +3,8 @@ module.exports = {
   name: '会员系统',
   // 必填: 后端api地址, 斜杠/结尾
   // apiUrl: 'http://192.168.1.103:8999/',
-  apiUrl: 'http://192.168.10.31:8999/',//服务器
+  // apiUrl: 'http://192.168.10.31:8999/',//服务器
+  apiUrl: 'http://192.168.10.70:8999/',
   // 必填: 默认商户号，从后台商户列表获取
   merchantNo: '10001',
 }

fuintUniapp/pages.json

@@ -4,23 +4,27 @@
 		"selectedColor": "#ff0000",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
-    "fontSize":"30rpx",
-    "list": [{
+		"fontSize": "30rpx",
+		"list": [
+			{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar/home.png",
 				"selectedIconPath": "static/tabbar/home-active.png",
 				"text": "首页"
-    }, {
+			},
+			{
 				"pagePath": "pages/category/index",
 				"iconPath": "static/tabbar/shop.png",
 				"selectedIconPath": "static/tabbar/shop-active.png",
 				"text": "微店"
-    },{
+			},
+			{
 				"pagePath": "pages/user/index",
 				"iconPath": "static/tabbar/user.png",
 				"selectedIconPath": "static/tabbar/user-active.png",
 				"text": "我的"
-    }]
+			}
+		]
 	},
 	"pages": [
 		{
@@ -342,6 +346,18 @@
 			"style": {
 				"navigationBarTitleText": "卡券兑换"
 			}
+		},
+		{
+			"path": "pages/companyInformation/companyInformation",
+			"style": {
+				"navigationBarTitleText": "公司信息"
+			}
+		},
+		{
+			"path": "pages/companyDetil/companyDetil",
+			"style": {
+				"navigationBarTitleText": "公司详情"
+			}
 		}
 	],
 	"globalStyle": {

fuintUniapp/pages/goods/detail.vue

@@ -104,9 +104,9 @@
                 </view>
                 <view class="tel">联系电话：{{ storeList.phone }}</view>
               </view>
-              <view class="loc-info">
+              <!-- <view class="loc-info">
                 <text class="dis"><text class="distance">{{ parseFloat(storeList.distance).toFixed(1) }}</text>公里</text>
-              </view>
+              </view> -->
             </view>
           </u-modal>
 

fuintUniapp/pages/index/index.vue

@@ -15,15 +15,15 @@
       </block>
 
       
-      <block>
+      <!-- <block>
           咨讯
-          <!-- <News v-if="storeInfo" :itemStyle="options.newsStyle" :params="options.newsParam" :dataList="news"/> -->
-      </block>
+          <News v-if="storeInfo" :itemStyle="options.newsStyle" :params="options.newsParam" :dataList="news"/>
+      </block> -->
 
 
-      <!-- <block>
+      <block>
           <NavBar v-if="storeInfo" :itemStyle="options.navStyle" :params="{}" :dataList="options.navBar"/>
-      </block> -->
+      </block>
       <block>
           <Blank v-if="storeInfo" :itemStyle="options.blankStyle"/>
       </block>
@@ -67,11 +67,15 @@
                 "background": "#ffffff",
             },
             "navBar": [{
-                        "imgUrl": "/static/nav/1.png",
+                        // "imgUrl": "/static/nav/1.png",
+                        "imgUrl": "/static/nav/gsxx.png",
                         "imgName": "icon-1.png",
-                        "linkUrl": "pages\/pay\/index",
-                        "text": "买单支付",
-                        "tip": "支付攒积分",
+                        // "linkUrl": "pages\/pay\/index",
+                        // "text": "买单支付",
+                        "linkUrl": "pages\/companyInformation\/companyInformation",
+                        "text": "公司信息",
+                        // "tip": "支付攒积分",
+                        "tip": "公司信息",
                         "color": "#666666"
                     }, {
                         "imgUrl": "/static/nav/3.png",