更新

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserServiceImpl.java

@@ -271,12 +271,16 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Override
     public void test() throws Exception {
-        MessageDO messageDO = new MessageDO();
-        messageDO.setResult("请及时审核");
-        messageDO.setPath("/sale/trade");
-        messageDO.setCompanyId(2l);
-        messageMapper.insert(messageDO);
-        webSocket.sendMessageByRole(messageDO, "内勤", 2l);
+        Map<String, Object> map = new HashMap<>();
+        map.put("value", "123");
+        map.put("valueOne", "付款审核任务");
+        map.put("valueTwo", "123");
+        map.put("url", "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/5dc2099ab5554334ba49934259f850c6.png");
+        map.put("templateId", "ZjfkR3lhNridBsIu4ai3ViTgphg_hSB7cGUUHZpsBS8");
+        map.put("userId", 1856);
+        map.put("header", "待办任务提醒");
+        map.put("remark", "请进入小程序（我的-我的合同）进行查看");
+        sendUtils.sendMessageForNotice(map);
     }
 
 

unimall-admin/src/views/login/index.vue

@@ -5,16 +5,19 @@
     <div class="login-weaper animated bounceInDown">
 
       <div class="login-left">
-        <div class="login-time">
-          目前支持平台：微信小程序、Android、IOS
-        </div>
-        <span>功能</span>
-        <el-divider/>
-        <span>此平台提供行业内企业或个人待销库存的展示、收购需求发布、便捷物流承运、行业全业务链流程管理（业务ERP）。</span>
-        <el-divider/>
         <span>目标</span>
         <el-divider/>
         <span>为了提高粮食贸易周转速度及粮食承运的效率 ，契合当下传统粮食贸易行业向互联网模式转变的市场方向。方便管理员和操作员的一些实时管理操作，解决业务人工处理时所带来的低效率、易出错和难管理等问题。我们致力于开发一款结合线上采销信息公布、物流线上操作、行情信息分析展示等等粮食贸易行业全业务链、全方位的线上服务平台，以解决行业痛点，发展行业E+经营模式为目标。</span>
+
+        <el-divider/>
+        <span>易粮易运APP技术支持</span>
+        <el-divider/>
+        <span>联系方式：微信 ccjgmwz </span>
+        <span>手机 18241771147</span>
+        <span>QQ 841968545</span>
+        <span>邮箱 ccjgmwz@foxmail.com</span>
+        <span>联系地址：辽宁省营口市鲅鱼圈区</span>
+        <span>联系人：程长江</span>
       </div>
       <div class="login-border">
         <div class="login-main">

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/sys/DictAppAppServiceImpl.java

@@ -34,20 +34,31 @@ public class DictAppAppServiceImpl implements DictAppService {
     @Override
     public List<SysDictDataDO> getDictDataList(String dictType,Long userId) {
         List<SysDictDataDO> dictDataList = new ArrayList<>();
-        UserDO userDO = userMapper.selectById(userId);
-        Wrapper<SysDictDataDO> wrapper = new EntityWrapper<SysDictDataDO>();
-        if (dictType != null) {
-            wrapper.eq("dict_type", dictType);
-        }
-        if(userDO != null && userDO.getCompanyId() != null){
-            wrapper.eq("company_id", userDO.getCompanyId());
+        if(userId != null){
+            UserDO userDO = userMapper.selectById(userId);
+            Wrapper<SysDictDataDO> wrapper = new EntityWrapper<SysDictDataDO>();
+            if (dictType != null) {
+                wrapper.eq("dict_type", dictType);
+            }
+            if(userDO != null && userDO.getCompanyId() != null){
+                wrapper.eq("company_id", userDO.getCompanyId());
+            }
+            else{
+                wrapper.eq("company_id", 1);
+            }
+            wrapper.orderBy("sort",true);
+            dictDataList = sysDictDataMapper.selectList(wrapper);
+            return dictDataList;
         }
         else{
+            Wrapper<SysDictDataDO> wrapper = new EntityWrapper<SysDictDataDO>();
+            wrapper.eq("dict_type", dictType);
             wrapper.eq("company_id", 1);
+            wrapper.orderBy("sort",true);
+            dictDataList = sysDictDataMapper.selectList(wrapper);
+            return dictDataList;
         }
-        wrapper.orderBy("sort",true);
-        dictDataList = sysDictDataMapper.selectList(wrapper);
-        return dictDataList;
+
     }
 
 }

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/sys/DictAppService.java

@@ -20,5 +20,5 @@ public interface DictAppService {
     @HttpMethod(description = "获取数据字典")
     public List<SysDictDataDO> getDictDataList(
             @NotNull @HttpParam(name = "dictType", type = HttpParamType.COMMON, description = "dictType") String dictType,
-            @NotNull @HttpParam(name = "userId", type = HttpParamType.USER_ID, description = "用户Id") Long userId) throws ServiceException;
+            @HttpParam(name = "userId", type = HttpParamType.USER_ID, description = "用户Id") Long userId) throws ServiceException;
 }

unimall-app/config/index.js

@@ -1,15 +1,5 @@
 const dev = {
 	// baseUrl: 'http://127.0.0.1:8080',
-<<<<<<< HEAD
-	// baseUrl: 'http://192.168.1.109:8080',
-=======
-	// baseUrl: 'http://192.168.1.120:8080',
->>>>>>> 0055f9d963529ffad903ba8e691bdf5c3dfacd25
-	// baseUrl: 'http://192.168.1.115:8080',
-	// baseUrl: 'http://192.168.1.124:8080',
-	// baseUrl: 'http://192.168.1.113:8080',
-	// baseUrl: 'http://192.168.8.188:8081',
-	// baseUrl: 'https://www.zhuqt.icu',
 	baseUrl: 'https://www.zthymaoyi.com',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

unimall-app/pages.json

@@ -5,8 +5,8 @@
 		"lazyCodeLoading": "requiredComponents",
 		"tabBar": {
 			"custom":true,
-			"color": "#C0C4CC",
-			"selectedColor": "#56ccf2",
+			"color": "#7A7E83",
+			"selectedColor": "#3cc51f",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [
@@ -796,8 +796,8 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "易粮易运",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#f8f8f8"
+		"navigationBarBackgroundColor": "#FFFFFF"
+		// "backgroundColor": "#f8f8f8"
 		
 	},
 	

unimall-app/pages/sale/information.vue

@@ -132,7 +132,6 @@
 			</view>
 			
 		</view>
-		
 		<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
 		<!-- <view v-if='scrollTop>100' class='goTop'><image src='../../static/top.png'  @click="goTop"></image></view> -->
 		
@@ -216,7 +215,6 @@
 						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png",
 						text: '资讯',
 						count: 0	,
-						isDot: true,
 						customIcon: false,
 						pagePath:'/pages/sale/information'
 					},
@@ -233,7 +231,7 @@
 						text: '粮信',
 						midButton: true,
 						customIcon: false,
-						// pagePath:'/pages/home/home'
+						pagePath:'/pages/home/home'
 					},
 					{
 						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png",