admin_ui/src/page/login/userlogin.vue

@@ -98,9 +98,9 @@ export default {
         //角色ID
         roleId: '',
         //用户名
-        username: 'admin',
+        username: '',
         //密码
-        password: 'admin',
+        password: '',
         //账号类型
         type: 'account',
         //验证码的值

miniapp/common/setting.js

@@ -9,9 +9,9 @@ module.exports = {
 	// 版本号
 	version: '0.1.0',
 	// 开发环境接口Url
-	devUrl: 'http://192.168.3.182:9232',//因为是微服务架构，所以开发环境也全部调服务器，需要调本地服务的配置到biz.js里
+	devUrl: 'https://ycwh.pj.farwalker.cn/api', //'http://192.168.3.182:9232',//因为是微服务架构，所以开发环境也全部调服务器，需要调本地服务的配置到biz.js里
 	// 线上环境接口Url
-	prodUrl: 'http://ycwh.pj.farwalker.cn/api',
+	prodUrl: 'https://ycwh.pj.farwalker.cn/api',
 	// 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
 	contentType: 'application/json;charset=UTF-8',
 	// 后端返回状态码

miniapp/pages/yuecai/home/index.vue

@@ -17,28 +17,40 @@
       <view class="p-l-r-30 p-t-30 dis-flex flex-x-around nav-btns">
         <view class="nav-btn" @click="navTo('professional_style')">
           <view class="nav-btn-icon icon-circle">
-            <u-image width="32px" height="32px" mode="aspectFit" src="@/static/images/home/professional.png"></u-image>
+            <u-image width="32px" height="32px" mode="aspectFit" src="@/static/images/home/he.png"></u-image>
           </view>
-          <view class="nav-btn-text">专业风采</view>
+          <view class="nav-btn-text">和乐文化</view>
         </view>
         <view class="nav-btn" @click="navTo('guagnfu')">
           <view class="nav-btn-icon icon-circle">
+<<<<<<< HEAD
+            <u-image width="28px" height="28px" mode="aspectFit" src="@/static/images/home/le.png"></u-image>
+=======
             <view style="width: 30px;font-size: 28px;font-weight: 28px;">广</view>
             <!-- <u-image width="28px" height="28px" mode="aspectFit" src="@/static/images/home/restaurant.png"></u-image> -->
+>>>>>>> 171013703e243ba672ce7006208b94d075f2c913
           </view>
           <view class="nav-btn-text">广府菜</view>
         </view>
         <view class="nav-btn" @click="navTo('chaozhou')">
           <view class="nav-btn-icon icon-circle">
+<<<<<<< HEAD
+            <u-image width="28px" height="28px" mode="aspectFit" src="@/static/images/home/xin.png"></u-image>
+=======
             <view style="width: 30px;font-size: 28px;font-weight: 28px;">潮</view>
             <!-- <u-image width="28px" height="28px" mode="aspectFit" src="@/static/images/home/dish.png"></u-image> -->
+>>>>>>> 171013703e243ba672ce7006208b94d075f2c913
           </view>
           <view class="nav-btn-text">潮州菜</view>
         </view>
         <view class="nav-btn" @click="navTo('kejia')">
           <view class="nav-btn-icon icon-circle">
+<<<<<<< HEAD
+            <u-image width="28px" height="28px" mode="aspectFit" src="@/static/images/home/xi.png"></u-image>
+=======
             <view style="width: 30px;font-size: 28px;font-weight: 28px;">客</view>
             <!-- <u-image width="28px" height="28px" mode="aspectFit" src="@/static/images/home/snacks.png"></u-image> -->
+>>>>>>> 171013703e243ba672ce7006208b94d075f2c913
           </view>
           <view class="nav-btn-text">客家菜</view>
         </view>