From 6beb066cae877ac1ec9b3627fc83bab9a018d3cd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 16:32:37 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java | 22 -
zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java | 3
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 46 --
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 12
zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java | 8
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java | 26
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java | 80 ---
zq-erp/src/main/resources/static/js/function/vip.js | 21 -
zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java | 81 +++-
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java | 32 -
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html | 1
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 173 +++++----
zq-erp/src/main/java/com/matrix/system/hive/action/BaseController.java | 11
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java | 15
/dev/null | 251 -------------
zq-erp/src/test/java/com/matrix/JyyTests.java | 65 ++
zq-erp/src/main/java/com/matrix/system/common/bean/SysFnBtnRel.java | 50 ++
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java | 11
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 7
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java | 8
zq-erp/src/main/java/com/matrix/system/constance/SystemConstance.java | 9
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java | 4
zq-erp/src/main/java/com/matrix/system/common/bean/SysFunction.java | 50 ++
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java | 38 ++
24 files changed, 423 insertions(+), 601 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java b/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
index b34a8e5..14b6089 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
@@ -1,5 +1,10 @@
package com.matrix.system.app.authority;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.matrix.component.redis.RedisClient;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
@@ -31,7 +36,12 @@
private static final int DEFAULT_2 = 2;
@Autowired
+ RedisClient redisClient;
+
+ @Autowired
SysFunctionService sysFunctionService;
+
+ public static final String USER_POWER_REDISKEY = "USER_POWER_";
public static final String USERFUNCTION = "userFunction";
/** 用户所有路径权限的记录 **/
@@ -91,8 +101,32 @@
List<String> userUrlMapping = new ArrayList<>();
- // 获取用户所有权限
- getUserFunction(user,userFunction, userUrlMapping);
+ String redisKey = USER_POWER_REDISKEY + SecureUtil.md5(user.getSuId()+"");
+ String cachedValue = redisClient.getCachedValue(redisKey);
+ if (StringUtils.isNotBlank(cachedValue)) {
+ //从缓存中获取用户权限
+ JSONObject powerMap = JSONUtil.parseObj(cachedValue);
+ String userFunctionMapStr = powerMap.get(USERFUNCTION).toString();
+ JSONObject userFunctionMap = JSONUtil.parseObj(userFunctionMapStr);
+ Set<String> userFunctionMapKeys = userFunctionMap.keySet();
+ userFunctionMapKeys.forEach(key -> {
+ userFunction.put(key, userFunctionMap.get(key, SysFunction.class));
+ });
+
+ String userUrlMappingListStr = powerMap.get(USER_URL_MAPPING).toString();
+ JSONArray userUrlMappingArray = JSONUtil.parseArray(userUrlMappingListStr);
+ for (int i = 0; i < userUrlMappingArray.size(); i++) {
+ userUrlMapping.add(userUrlMappingArray.get(i, String.class));
+ }
+ } else {
+ // 获取用户所有权限
+ getUserFunction(user,userFunction, userUrlMapping);
+
+ Map<String ,Object> powerMap=new HashMap<>();
+ powerMap.put(USERFUNCTION, userFunction);
+ powerMap.put(USER_URL_MAPPING, userUrlMapping);
+ redisClient.saveValue(redisKey,JSONUtil.parseObj(powerMap,true));
+ }
// TODO 这里的用户权限应该放到redis缓存中，在拦截器中做权限拦截
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
index 8a8dbd6..70b7250 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
@@ -25,9 +25,7 @@
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
-import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.action.util.QueryUtil;
-import com.matrix.system.hive.bean.SysVipInfo;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -45,11 +43,8 @@
import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
-
-import static com.matrix.system.common.constance.AppConstance.SAFEPATH;
/**
* @author 姜ø友瑶
@@ -486,23 +481,6 @@
}
- /**
- * 查询历史搜索人数
- *
- * @return
- * @author luoyuanhong
- */
- @SuppressWarnings("unchecked")
- @RequestMapping(value = "/showHistoryUser")
- public @ResponseBody
- AjaxResult showHistoryUser() {
- if (WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER) != null) {
- return new AjaxResult(AjaxResult.STATUS_SUCCESS,
- (LinkedList<SysVipInfo>) WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER), 0);
- } else {
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, null, 0);
- }
- }
/**
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java
index 3920353..d242a64 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java
@@ -1,5 +1,6 @@
package com.matrix.system.common.actions;
+import com.matrix.component.redis.RedisClient;
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.anotations.SaveRequestToken;
import com.matrix.core.constance.MatrixConstance;
@@ -9,6 +10,7 @@
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.web.BaseAction;
+import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.bean.SysFnBtnRel;
import com.matrix.system.common.bean.SysFunction;
import com.matrix.system.common.bean.SysRole;
@@ -16,7 +18,6 @@
import com.matrix.system.common.constance.AppVocabularyCode;
import com.matrix.system.common.service.SysFunctionService;
import com.matrix.system.common.service.SysRoleService;
-import com.matrix.system.constance.Dictionary;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@@ -49,7 +50,8 @@
private SysFunctionService sysFunctionService;
public static final String BEV = "SYSROLE_BEV";
-
+ @Autowired
+ RedisClient redisClient;
/**
* 列表显示
*
@@ -230,9 +232,11 @@
}
AjaxResult result = modify(sysRoleService, WebUtil.getSessionAttribute(BEV), sysRole, AppVocabularyCode.ROLE);
WebUtil.removeSessionAttribute(BEV);
+ redisClient.batchDel(DefaultAuthorityManager.USER_POWER_REDISKEY);
return result;
}
+
/**
* 进入修改界面
*
diff --git a/zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java b/zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java
index ce8ae52..c521ca6 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java
@@ -1,8 +1,12 @@
package com.matrix.system.common.authority;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.matrix.component.redis.RedisClient;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.authority.strategy.LoginStrategy;
@@ -17,7 +21,6 @@
import java.util.*;
import java.util.Map.Entry;
-import java.util.logging.Logger;
/**
* DefaultAuthorityManager 实现了权限控制接口
@@ -31,13 +34,20 @@
private static final int DEFAULT_2 = 2;
+ public static final String USER_POWER_REDISKEY = "USER_POWER_";
+
@Autowired
SysFunctionService sysFunctionService;
public static final String USERFUNCTION = "userFunction";
public static final String MENUSFUNCTION = "menusFunction";
- /** 用户所有路径权限的记录 **/
+ /**
+ * 用户所有路径权限的记录
+ **/
public static final String USER_URL_MAPPING = "userUrlMapping";
+
+ @Autowired
+ RedisClient redisClient;
private DefaultAuthorityManager() {
}
@@ -90,6 +100,7 @@
/**
* 判断用户是否具有功能权限
+ *
* @return
*/
@Override
@@ -108,10 +119,10 @@
/**
* 初始化用户权限
*
+ * @param result
* @author JIANGYOUYAO
* @email 935090232@qq.com
* @date 2017年12月5日
- * @param result
*/
public void initUserPower(AjaxResult result) {
@@ -127,11 +138,43 @@
// 用户的所有功能权限用id记录，方便后面查询菜单树形结构
Map<String, SysFunction> menuFunctionMap = new TreeMap<>();
- // 获取用户所有权限
- getUserFunction(userFunction, menuFunctionMap, userUrlMapping);
+ SysUsers sysUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- // 组装菜单
- assembleMenu(menuFunction, menuFunctionMap);
+ String redisKey = USER_POWER_REDISKEY + SecureUtil.md5(sysUser.getSuId()+"");
+ String cachedValue = redisClient.getCachedValue(redisKey);
+ if (StringUtils.isNotBlank(cachedValue)) {
+ //从缓存中获取用户权限
+ JSONObject powerMap = JSONUtil.parseObj(cachedValue);
+ String userFunctionMapStr = powerMap.get(USERFUNCTION).toString();
+ JSONObject userFunctionMap = JSONUtil.parseObj(userFunctionMapStr);
+ Set<String> userFunctionMapKeys = userFunctionMap.keySet();
+ userFunctionMapKeys.forEach(key -> {
+ userFunction.put(key, userFunctionMap.get(key, SysFunction.class));
+ });
+ String menusFunctionListStr = powerMap.get(MENUSFUNCTION).toString();
+ JSONArray menusFunctionArray = JSONUtil.parseArray(menusFunctionListStr);
+ for (int i = 0; i < menusFunctionArray.size(); i++) {
+ menuFunction.add(menusFunctionArray.get(i, SysFunction.class));
+ }
+ String userUrlMappingListStr = powerMap.get(USER_URL_MAPPING).toString();
+ JSONArray userUrlMappingArray = JSONUtil.parseArray(userUrlMappingListStr);
+ for (int i = 0; i < userUrlMappingArray.size(); i++) {
+ userUrlMapping.add(userUrlMappingArray.get(i, String.class));
+ }
+ } else {
+ // 获取用户所有权限
+ getUserFunction(userFunction, menuFunctionMap, userUrlMapping);
+
+ // 组装菜单
+ assembleMenu(menuFunction, menuFunctionMap);
+
+ Map<String ,Object> powerMap=new HashMap<>();
+ powerMap.put(USERFUNCTION, userFunction);
+ powerMap.put(MENUSFUNCTION, menuFunction);
+ powerMap.put(USER_URL_MAPPING, userUrlMapping);
+ redisClient.saveValue(redisKey,JSONUtil.parseObj(powerMap,true));
+ }
+
// 把用户菜单和用户的功能都存在session中。
WebUtil.setSessionAttribute(USERFUNCTION, userFunction);
@@ -145,12 +188,12 @@
/**
* 获取用的功能，包括菜单功能和非菜单功能
*
- * @author JIANGYOUYAO
- * @email 935090232@qq.com
- * @date 2017年12月5日
* @param userFunctionMap
* @param menuFunctionMap
* @param userUrlMapping
+ * @author JIANGYOUYAO
+ * @email 935090232@qq.com
+ * @date 2017年12月5日
*/
private void getUserFunction(Map<String, SysFunction> userFunctionMap, Map<String, SysFunction> menuFunctionMap,
List<String> userUrlMapping) {
@@ -165,7 +208,7 @@
userFunctionMap.put(sysFunction.getFnCode(), sysFunction);
// 注册访问路径
- registerUrlMapping(userUrlMapping, sysFunction,true);
+ registerUrlMapping(userUrlMapping, sysFunction, true);
// 如果是菜单功能单独记录
if (AppConstance.IS_Y.equals(sysFunction.getFnShowMenu())) {
@@ -177,7 +220,7 @@
List<SysFunction> userFunctionList = sysFunctionService.findFunctionByRoleIds(sysUser.getRoleIds());
for (SysFunction sysFunction : userFunctionList) {
// TODO注册访问路径
- registerUrlMapping(userUrlMapping, sysFunction,false);
+ registerUrlMapping(userUrlMapping, sysFunction, false);
if (userFunctionMap.containsKey(sysFunction.getFnCode())) {
@@ -204,11 +247,11 @@
/**
* 注册功能和按钮的访问路径
*
+ * @param userUrlMapping
+ * @param sysFunction
* @author JIANGYOUYAO
* @email 935090232@qq.com
* @date 2017年12月8日
- * @param userUrlMapping
- * @param sysFunction
*/
private void registerUrlMapping(List<String> userUrlMapping, SysFunction sysFunction, boolean isAdmin) {
String path = sysFunction.getFnPath();
@@ -220,7 +263,7 @@
if (CollectionUtils.isNotEmpty(btnRels)) {
for (SysFnBtnRel sysFnBtnRel : btnRels) {
//公司管理员可以添加所有按钮权限否则只能添加员工自己所有拥有的权限
- if(isAdmin ||StringUtils.isContentSet(sysFnBtnRel.getBtnValue(),sysFunction.getRpfBns())){
+ if (isAdmin || StringUtils.isContentSet(sysFnBtnRel.getBtnValue(), sysFunction.getRpfBns())) {
String btnPath = sysFnBtnRel.getFbPath();
if (StringUtils.isNotBlank(btnPath) && !userUrlMapping.contains(btnPath)) {
userUrlMapping.add(btnPath);
@@ -233,11 +276,11 @@
/**
* 把菜单组装成树形结构
*
+ * @param menuFunction
+ * @param menuFunctionMap
* @author JIANGYOUYAO
* @email 935090232@qq.com
* @date 2017年12月5日
- * @param menuFunction
- * @param menuFunctionMap
*/
private void assembleMenu(List<SysFunction> menuFunction, Map<String, SysFunction> menuFunctionMap) {
// 将map.entrySet()转换成list,并按照功能的FnSequence倒序
@@ -261,7 +304,7 @@
} else {
// 非一级节点找到父节点后存入
SysFunction parentFn = menuFunctionMap.get(String.valueOf(function.getFnParentId()));
- if(parentFn!=null){
+ if (parentFn != null) {
List<SysFunction> childs = parentFn.getChilds();
if (childs == null) {
parentFn.setChilds(new ArrayList<SysFunction>());
diff --git a/zq-erp/src/main/java/com/matrix/system/common/bean/SysFnBtnRel.java b/zq-erp/src/main/java/com/matrix/system/common/bean/SysFnBtnRel.java
index 2c67c60..7e81a99 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/bean/SysFnBtnRel.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/bean/SysFnBtnRel.java
@@ -1,7 +1,9 @@
package com.matrix.system.common.bean;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
-import com.matrix.core.pojo.EntityDTO;
+
+import java.util.Date;
/**
* 功能按钮关系表
@@ -9,11 +11,21 @@
* @email 935090232@qq.com
* @date 2017年12月3日
*/
-public class SysFnBtnRel extends EntityDTO {
+public class SysFnBtnRel {
@Extend
private static final long serialVersionUID = 1L;
-
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date createTime;
+
+ private String updateBy;
+
+ private Date updateTime;
+
+
/** 主键:这个关系表物理主键在修改比较中不参与比较 **/
@Extend
private Long fbId;
@@ -80,4 +92,36 @@
public void setBtnKey(String btnKey) {
this.btnKey = btnKey;
}
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
}
diff --git a/zq-erp/src/main/java/com/matrix/system/common/bean/SysFunction.java b/zq-erp/src/main/java/com/matrix/system/common/bean/SysFunction.java
index 318325b..2f03b79 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/bean/SysFunction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/bean/SysFunction.java
@@ -1,9 +1,9 @@
package com.matrix.system.common.bean;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
-import com.matrix.core.pojo.EntityDTO;
-import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -12,10 +12,19 @@
* @email 935090232@qq.com
* @date 2017年12月3日
*/
-public class SysFunction extends EntityDTO {
+public class SysFunction {
@Extend
private static final long serialVersionUID = 1L;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date createTime;
+
+ private String updateBy;
+
+ private Date updateTime;
private Long fnId;
@@ -203,4 +212,39 @@
this.fnCode = fnCode;
}
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public boolean isHasThisFn() {
+ return hasThisFn;
+ }
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java b/zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java
index 19aee94..c8fe8d7 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java
@@ -19,8 +19,11 @@
private static final long serialVersionUID = 1L;
/** 有效*/
+ @Extend
public static final String VALID_Y="Y";
+
/** 无效*/
+ @Extend
public static final String VALID_N="N";
private Long suId;
diff --git a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
index 2d78a95..538ffde 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
@@ -12,6 +12,7 @@
public static final String WX_ORDER_FLAG = "微商城同步订单";
public static final String ZONGDIAN = "总店";
+
private AppConstance() {
}
@@ -559,9 +560,10 @@
public static final String APP_BANNER_GL = "APP_BANNER_GL";
-
-
-
+ /**
+ * 是否管理产品库存
+ */
+ public static final String WAREHOUSE_MANAGE_STOCK = "WAREHOUSE_MANAGE_STOCK";
diff --git a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
index 8b6ce98..86b537b 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
@@ -1,12 +1,16 @@
package com.matrix.system.common.service.impl;
+import cn.hutool.crypto.SecureUtil;
+import com.matrix.component.redis.RedisClient;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.ModelUtils;
import com.matrix.core.tools.WebUtil;
+import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.bean.SysUserLoginRecord;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
@@ -20,8 +24,6 @@
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.SysShopInfoDao;
-import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.core.tools.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,7 +47,8 @@
private static final String SU_ID = "su_id";
private static final String SU_ACCOUNT = "su_account";
-
+ @Autowired
+ RedisClient redisClient;
@Autowired
private SysUsersDao sysUsersDao;
@@ -128,8 +131,12 @@
}
if (modifyMap.size() > 0) {
modifyMap.put("suId", oldSysUsers.getSuId());
- return sysUsersDao.updateByMap(modifyMap);
+ sysUsersDao.updateByMap(modifyMap);
}
+ //删除用户权限缓存
+ String redisKey=DefaultAuthorityManager.USER_POWER_REDISKEY+ SecureUtil.md5(oldSysUsers.getSuId()+"");
+ redisClient.removeObject(redisKey);
+
return MatrixConstance.DML_SUCCESSS;
}
diff --git a/zq-erp/src/main/java/com/matrix/system/constance/SystemConstance.java b/zq-erp/src/main/java/com/matrix/system/constance/SystemConstance.java
index 39616d4..1ce0092 100644
--- a/zq-erp/src/main/java/com/matrix/system/constance/SystemConstance.java
+++ b/zq-erp/src/main/java/com/matrix/system/constance/SystemConstance.java
@@ -3,10 +3,6 @@
public class SystemConstance {
- /**
- * 当前进行操作的用户
- */
- public static final String CURRENT_CUSTOMER = "CURRENT_CUSTOMER";
/**
@@ -14,10 +10,7 @@
*/
public static final String SYSTEM_USER = "SYSTEM";
- /**
- * 查询历史记录
- */
- public static final String HISTORY_CUSTOMER = "HISTORY_CUSTOMER";
+
/**
* 登陆前要访问的地址
*/
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/BaseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/BaseController.java
index 28052cf..3a8afed 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/BaseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/BaseController.java
@@ -6,8 +6,6 @@
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.constance.SystemConstance;
-import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.plugin.util.BaseServices;
import java.util.List;
@@ -75,14 +73,7 @@
}
- /**
- * 获取当前操作的会员对象
- * @author 姜友瑶
- * @date 2016/7/5
- */
- public SysVipInfo getCurrentVioInfo() {
- return (SysVipInfo) (WebUtil.getSession().getAttribute(SystemConstance.CURRENT_CUSTOMER));
- }
+
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index 0b5c95a..5e47996 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -15,12 +15,9 @@
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
-import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.pojo.ShoppingCarItem;
-import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.*;
import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
@@ -190,49 +187,6 @@
return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单保存成功");
}
- /**
- * 新建订单
- *
- * @author jiangyouyao
- */
- @RequestMapping(value = "/addOrder")
- public @ResponseBody
- AjaxResult addOrder(ShoppingCarItemsVo car) {
-
- List<ShoppingCarItem> sessionCarItems = (List<ShoppingCarItem>) WebUtil.getSession().getAttribute(
- SystemConstance.SHOPPING_CAR);
-
- List<ShoppingCarItem> carItems = new ArrayList<>();
-
- // 设置购车中的具体类型信息,过滤没有被选中的商品
- for (ShoppingCarItem carItem : car.getCarItems()) {
-
- for (ShoppingCarItem sessionCar : sessionCarItems) {
-
- if (carItem.getId().equals(sessionCar.getId())) {
- //已最后提交的数量为准
- sessionCar.setCount(carItem.getCount());
- carItems.add(sessionCar);
- break;
- }
- }
- }
- //设置过滤后的购物车条目
- car.setCarItems(carItems);
-
- SysVipInfo info = (SysVipInfo) WebUtil.getSession().getAttribute(SystemConstance.CURRENT_CUSTOMER);
- car.setVipId(info.getId());
-
- // 添加新订单
- int i = orderService.createOrder(WebUtil.getSession(), car);
-
- if (i > 0) {
- WebUtil.getSession().removeAttribute(SystemConstance.SHOPPING_CAR);
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, "下单成功");
- } else {
- return new AjaxResult(AjaxResult.STATUS_FAIL, "下单添加失败");
- }
- }
/**
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index 00b210a..0924ecd 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -489,8 +489,7 @@
@RequestMapping(value = "/addService")
public @ResponseBody
AjaxResult servicceAdd(@RequestBody SysProjServices sysProjServices) {
- SysVipInfo vipInfo = getCurrentVioInfo();
- sysProjServices.setVipId(vipInfo.getId());
+
if (CollectionUtils.isEmpty(sysProjServices.getServiceItems())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "没有选中可消耗的项目");
@@ -520,8 +519,8 @@
@RequestMapping(value = "/addServiceForForm")
public @ResponseBody
AjaxResult servicceAddForForm(SysProjServices sysProjServices) {
- SysVipInfo vipInfo = getCurrentVioInfo();
- sysProjServices.setVipId(vipInfo.getId());
+
+
if (CollectionUtils.isEmpty(sysProjServices.getServiceItems())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "没有选中可消耗的项目");
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index 4eb94d9..aa8f6b4 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -17,7 +17,6 @@
import com.matrix.system.common.service.SystemDictionaryService;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
-import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.Question;
import com.matrix.system.hive.bean.SysVipInfo;
@@ -48,7 +47,10 @@
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
/**
@@ -403,33 +405,7 @@
@RequestMapping(value = "/findUserByPhoneOrNo")
public @ResponseBody
AjaxResult findUserByPhoneOrNo(String keyWord) {
- LinkedList<SysVipInfo> userList = null;
- // 获取最近查询客户
- if (WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER) == null) {
- userList = new LinkedList<SysVipInfo>();
- WebUtil.getSession().setAttribute(SystemConstance.HISTORY_CUSTOMER, userList);
- } else {
- userList = (LinkedList<SysVipInfo>) WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER);
- }
List<SysVipInfo> vips = vipInfoService.findByVipNoOrTel(keyWord);
- if (vips.size() > 0) {
- // 在session存放当前查询的客户
- WebUtil.getSession().setAttribute(SystemConstance.CURRENT_CUSTOMER, vips.get(0));
- // 满20后删除一个
- if (userList.size() == 20) {
- userList.poll();
- }
- // 去重标志
- boolean isNoRepeat = true;
- for (SysVipInfo sysVipInfo : userList) {
- if (vips.get(0).getPhone().equals(sysVipInfo.getPhone())) {
- isNoRepeat = false;
- }
- }
- if (isNoRepeat) {
- userList.add(vips.get(0));
- }
- }
return new AjaxResult(AjaxResult.STATUS_SUCCESS, vips, 0);
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
index 1350bdb..628ca52 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
@@ -64,9 +64,7 @@
* 床位
*/
private Long bedId;
- /**
- * 床位
- */
+
private Long companyId;
/**
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index f91cbfd..4aeb01e 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -5,6 +5,7 @@
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.OrderListDto;
@@ -15,6 +16,7 @@
import com.matrix.system.app.vo.RankingVo;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
@@ -119,6 +121,8 @@
@Autowired
private SysInstoreInfoService sysInstoreInfoService;
+ @Autowired
+ BusParameterSettingsDao parameterSettingsDao;
@Value("${evn}")
private String evn;
@@ -984,8 +988,6 @@
}
- @Autowired
- BusParameterSettingsDao parameterSettingsDao;
/**
* @param order 新增出库单并更新本店库存
@@ -995,103 +997,110 @@
@Override
public void addOutStore(SysOrder order) {
- List<SysOutStoreItem> storeItemList = new ArrayList<>();
+ BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId());
+ if(AppConstance.IS_Y.equals(manageStockSetting.getParamValue())){
- for (SysOrderItem sysOrderItem : order.getItems()) {
+ List<SysOutStoreItem> storeItemList = new ArrayList<>();
- if (ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP.equals(sysOrderItem.getType())) {
+ for (SysOrderItem sysOrderItem : order.getItems()) {
- SysOutStoreItem storeItem = new SysOutStoreItem();
- storeItem.setSkuId(sysOrderItem.getGoodsId());
- storeItem.setAmount(Double.valueOf(sysOrderItem.getCount()));
- storeItemList.add(storeItem);
+ if (ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP.equals(sysOrderItem.getType())) {
- } else if (ShoppingGoods.SHOPPING_GOODS_TYPE_TC.equals(sysOrderItem.getType())
+ SysOutStoreItem storeItem = new SysOutStoreItem();
+ storeItem.setSkuId(sysOrderItem.getGoodsId());
+ storeItem.setAmount(Double.valueOf(sysOrderItem.getCount()));
+ storeItemList.add(storeItem);
- || ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) {
+ } else if (ShoppingGoods.SHOPPING_GOODS_TYPE_TC.equals(sysOrderItem.getType())
- List<ShoppingGoodsAssemble> goodsList = new ArrayList<>();
+ || ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) {
- goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP));
+ List<ShoppingGoodsAssemble> goodsList = new ArrayList<>();
- if (ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) {
- //综合卡处理,中的套餐，中的家居产品
- List<ShoppingGoodsAssemble> zhkAssemble = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_TC);
- zhkAssemble.forEach(item -> {
- goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(item.getAssembleGoodId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP));
+ goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP));
+
+ if (ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) {
+ //综合卡处理,中的套餐，中的家居产品
+ List<ShoppingGoodsAssemble> zhkAssemble = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_TC);
+ zhkAssemble.forEach(item -> {
+ goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(item.getAssembleGoodId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP));
+ });
+ }
+
+ goodsList.forEach(item -> {
+ SysOutStoreItem storeItem = new SysOutStoreItem();
+ storeItem.setSkuId(item.getAssembleGoodId());
+ storeItem.setAmount(Double.valueOf(item.getTotal()));
+ storeItemList.add(storeItem);
});
}
-
- goodsList.forEach(item -> {
- SysOutStoreItem storeItem = new SysOutStoreItem();
- storeItem.setSkuId(item.getAssembleGoodId());
- storeItem.setAmount(Double.valueOf(item.getTotal()));
- storeItemList.add(storeItem);
- });
}
- }
- if (CollectionUtils.isNotEmpty(storeItemList)) {
- Long warehouseId = warehouseDao.findShopWarehouse(order.getShopId()).get(0).getId();
- SysOutStore outStore = new SysOutStore();
- outStore.setOutStoreNo(codeService.getOutStoreCode());
- outStore.setOrderId(order.getId());
- outStore.setShopId(order.getShopId());
- outStore.setShopId(order.getShopId());
- outStore.setStaffId(order.getStaffId());
- outStore.setType(Dictionary.OUT_STORE_JJCPCK);
- outStore.setServiceNo(order.getOrderNo());
- outStore.setTime(new Date());
- outStore.setCheckStatus(Dictionary.CHECK_STATUS_DSH);
- outStore.setCompanyId(order.getCompanyId());
- sysOutStoreDao.insert(outStore);
+ if (CollectionUtils.isNotEmpty(storeItemList)) {
+ Long warehouseId = warehouseDao.findShopWarehouse(order.getShopId()).get(0).getId();
+ SysOutStore outStore = new SysOutStore();
+ outStore.setOutStoreNo(codeService.getOutStoreCode());
+ outStore.setOrderId(order.getId());
+ outStore.setShopId(order.getShopId());
+ outStore.setShopId(order.getShopId());
+ outStore.setStaffId(order.getStaffId());
+ outStore.setType(Dictionary.OUT_STORE_JJCPCK);
+ outStore.setServiceNo(order.getOrderNo());
+ outStore.setTime(new Date());
+ outStore.setCheckStatus(Dictionary.CHECK_STATUS_DSH);
+ outStore.setCompanyId(order.getCompanyId());
+ sysOutStoreDao.insert(outStore);
- //出库明细，根据批次维度定义
- List<SysOutStoreItem> realOutStoreItemList = new ArrayList<>();
+ //出库明细，根据批次维度定义
+ List<SysOutStoreItem> realOutStoreItemList = new ArrayList<>();
- storeItemList.forEach(outStoreItem -> {
+ storeItemList.forEach(outStoreItem -> {
- //设置出库主键
- outStoreItem.setOutStoreId(outStore.getId());
+ //设置出库主键
+ outStoreItem.setOutStoreId(outStore.getId());
- //计算库存总数是否满足本次扣减的需求
- List<SysStoreInfo> stores = storeInfoDao.selectStoInfoBySku(outStoreItem.getSkuId(), warehouseId);
- double sum = stores.stream().mapToDouble(item -> item.getStoreTotal()).sum();
- if (sum < outStoreItem.getAmount()) {
- ShoppingGoods sysGoods = shoppingGoodsDao.selectById(outStoreItem.getSkuId());
- if (sysGoods != null) {
- throw new GlobleException("出库失败：【" + sysGoods.getName() + "库存不足】");
+ //计算库存总数是否满足本次扣减的需求
+ List<SysStoreInfo> stores = storeInfoDao.selectStoInfoBySku(outStoreItem.getSkuId(), warehouseId);
+ double sum = stores.stream().mapToDouble(item -> item.getStoreTotal()).sum();
+ if (sum < outStoreItem.getAmount()) {
+ ShoppingGoods sysGoods = shoppingGoodsDao.selectById(outStoreItem.getSkuId());
+ if (sysGoods != null) {
+ throw new GlobleException("出库失败：【" + sysGoods.getName() + "库存不足】");
- } else {
- throw new GlobleException("出库失败没有找到出库产品");
+ } else {
+ throw new GlobleException("出库失败没有找到出库产品");
+ }
}
- }
- //循环获取所有批次产品，并扣减库存
- Double number = outStoreItem.getAmount();
- for (SysStoreInfo storeInfo : stores) {
- Double oldStoreTotal = storeInfo.getStoreTotal();
- Double surplus = storeInfo.getStoreTotal() - number;
- //更新库存
- storeInfo.setStoreTotal(surplus < 0 ? 0 : surplus);
+ //循环获取所有批次产品，并扣减库存
+ Double number = outStoreItem.getAmount();
+ for (SysStoreInfo storeInfo : stores) {
+ Double oldStoreTotal = storeInfo.getStoreTotal();
+ Double surplus = storeInfo.getStoreTotal() - number;
+ //更新库存
+ storeInfo.setStoreTotal(surplus < 0 ? 0 : surplus);
- //每次扣减库存都创建一个出库记录
- SysOutStoreItem sysOutStoreItem = new SysOutStoreItem();
- BeanUtils.copyProperties(outStoreItem, sysOutStoreItem);
- sysOutStoreItem.setStoreId(storeInfo.getId());
- sysOutStoreItem.setAmount(oldStoreTotal - storeInfo.getStoreTotal());
- realOutStoreItemList.add(sysOutStoreItem);
+ //每次扣减库存都创建一个出库记录
+ SysOutStoreItem sysOutStoreItem = new SysOutStoreItem();
+ BeanUtils.copyProperties(outStoreItem, sysOutStoreItem);
+ sysOutStoreItem.setStoreId(storeInfo.getId());
+ sysOutStoreItem.setAmount(oldStoreTotal - storeInfo.getStoreTotal());
+ realOutStoreItemList.add(sysOutStoreItem);
- storeInfoDao.update(storeInfo);
- //扣除后剩余库存大于0则跳出扣除,否则剩余数量的负数的绝对值就是再次扣减的数量
- if (surplus > 0) {
- break;
- } else {
- number = Math.abs(surplus);
+ storeInfoDao.update(storeInfo);
+ //扣除后剩余库存大于0则跳出扣除,否则剩余数量的负数的绝对值就是再次扣减的数量
+ if (surplus > 0) {
+ break;
+ } else {
+ number = Math.abs(surplus);
+ }
}
- }
- });
- sysOutStoreItemDao.batchInsert(realOutStoreItemList);
+ });
+ sysOutStoreItemDao.batchInsert(realOutStoreItemList);
+ }
+
+ }else{
+ LogUtil.debug("不管理库存");
}
@@ -1636,10 +1645,14 @@
shoppingGoodsDao.update(goods);
}
- // 家居产品退库存
- if (CollectionUtils.isNotEmpty(returnGoodsList)) {
- refundInstore(returnGoodsList);
+ BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, sysOrder.getCompanyId());
+ if(AppConstance.IS_Y.equals(manageStockSetting.getParamValue())){
+ // 家居产品退库存
+ if (CollectionUtils.isNotEmpty(returnGoodsList)) {
+ refundInstore(returnGoodsList);
+ }
}
+
}
/**
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index d9831f9..201fd5c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -14,6 +14,7 @@
import com.matrix.system.app.vo.ServiceOrderListVo;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
@@ -776,6 +777,7 @@
if (!projServices.getState().equals(Dictionary.SERVICE_STATU_XPL)) {
throw new GlobleException("该服务单状态为" + projServices.getState() + ",不可以进行当前操作!");
}
+ projServicesVo.setCompanyId(projServices.getCompanyId());
if (isNeedOutStore(projServicesVo)) {
// 生成出库单
@@ -879,10 +881,14 @@
* @return
*/
private boolean isNeedOutStore(SysProjServices projServicesVo) {
+
if (CollectionUtils.isNotEmpty(projServicesVo.getOutStoreItem())) {
- for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
- if (item.getAmount() != null && item.getAmount() > 0) {
- return true;
+ BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, projServicesVo.getCompanyId());
+ if(AppConstance.IS_Y.equals(manageStockSetting.getParamValue())){
+ for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
+ if (item.getAmount() != null && item.getAmount() > 0) {
+ return true;
+ }
}
}
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
index 081934e..d97fbba 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
@@ -97,16 +97,20 @@
@Override
public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) {
- Date minTime = findMinTime(shopId);
- Date maxTime = findMaxTime(shopId);
- minTime.setYear(beginTime.getYear());
- minTime.setMonth(beginTime.getMonth());
- minTime.setDate(beginTime.getDate());
- maxTime.setYear(beginTime.getYear());
- maxTime.setMonth(beginTime.getMonth());
- maxTime.setDate(beginTime.getDate());
- return (
- (DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime() )
- && DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() );
+ if(beginTime==null){
+ Date minTime = findMinTime(shopId);
+ Date maxTime = findMaxTime(shopId);
+ minTime.setYear(beginTime.getYear());
+ minTime.setMonth(beginTime.getMonth());
+ minTime.setDate(beginTime.getDate());
+ maxTime.setYear(beginTime.getYear());
+ maxTime.setMonth(beginTime.getMonth());
+ maxTime.setDate(beginTime.getDate());
+ return (
+ (DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime() )
+ && DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() );
+ }else{
+ return false;
+ }
}
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
index f2ed540..a412f07 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
@@ -11,21 +11,25 @@
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
-import com.matrix.system.common.bean.SystemDictionary;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.service.SystemDictionaryService;
+import com.matrix.system.common.bean.SystemDictionary;
import com.matrix.system.common.service.SysUsersService;
+import com.matrix.system.common.service.SystemDictionaryService;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
-import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
-import com.matrix.system.hive.bean.*;
+import com.matrix.system.hive.bean.Question;
+import com.matrix.system.hive.bean.SysVipInfo;
+import com.matrix.system.hive.bean.SysVipLevel;
+import com.matrix.system.hive.bean.VipAnswer;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
-import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.RegisterInfo;
-import com.matrix.system.hive.service.*;
+import com.matrix.system.hive.service.MoneyCardUseService;
+import com.matrix.system.hive.service.QuestionSerivce;
+import com.matrix.system.hive.service.SysVipInfoService;
+import com.matrix.system.hive.service.SysVipLevelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -42,7 +46,10 @@
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
/**
@@ -104,39 +111,7 @@
@RequestMapping(value = "/showVipInfo")
public @ResponseBody
AjaxResult findByModel(String keyWord) {
- LinkedList<SysVipInfo> userList = null;
- // 获取最近查询客户
- if (WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER) == null) {
- userList = new LinkedList<SysVipInfo>();
- WebUtil.getSession().setAttribute(SystemConstance.HISTORY_CUSTOMER, userList);
- } else {
- userList = (LinkedList<SysVipInfo>) WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER);
- }
List<SysVipInfo> vips = vipInfoService.findByVipNoOrTel(keyWord);
- if (vips.size() > 0) {
- // 在session存放当前查询的客户
- MoneyCardUse cardUseInfo = cardUseService.findByVipId(vips.get(0).getId());
- if (cardUseInfo == null) {
- cardUseInfo=vipInfoService.addVipDefaultCard(vips.get(0).getId());
- }
- vips.get(0).setLevelCard(cardUseInfo);
- WebUtil.getSession().setAttribute(SystemConstance.CURRENT_CUSTOMER, vips.get(0));
- // 满20后删除一个
- if (userList.size() == 20) {
- userList.poll();
- }
- // 去重标志
- boolean isNoRepeat = true;
- for (SysVipInfo sysVipInfo : userList) {
- if (vips.get(0).getPhone().equals(sysVipInfo.getPhone())) {
- isNoRepeat = false;
- }
- }
- if (isNoRepeat) {
- userList.add(vips.get(0));
- }
- }
-
return new AjaxResult(AjaxResult.STATUS_SUCCESS, vips, 0);
}
@@ -397,35 +372,8 @@
@RequestMapping(value = "/findUserByPhoneOrNo")
public @ResponseBody
AjaxResult findUserByPhoneOrNo(String keyWord) {
- LinkedList<SysVipInfo> userList = null;
- // 获取最近查询客户
- if (WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER) == null) {
- userList = new LinkedList<SysVipInfo>();
- WebUtil.getSession().setAttribute(SystemConstance.HISTORY_CUSTOMER, userList);
- } else {
- userList = (LinkedList<SysVipInfo>) WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER);
- }
List<SysVipInfo> vips = vipInfoService.findByVipNoOrTel(keyWord);
- if (vips.size() > 0) {
- // 在session存放当前查询的客户
- WebUtil.getSession().setAttribute(SystemConstance.CURRENT_CUSTOMER, vips.get(0));
- // 满20后删除一个
- if (userList.size() == 20) {
- userList.poll();
- }
- // 去重标志
- boolean isNoRepeat = true;
- for (SysVipInfo sysVipInfo : userList) {
- if (vips.get(0).getPhone().equals(sysVipInfo.getPhone())) {
- isNoRepeat = false;
- }
- }
- if (isNoRepeat) {
- userList.add(vips.get(0));
- }
- }
return new AjaxResult(AjaxResult.STATUS_SUCCESS, vips, 0);
-
}
@RequestMapping(value = "/getBirthday")
diff --git a/zq-erp/src/main/resources/static/js/function/vip.js b/zq-erp/src/main/resources/static/js/function/vip.js
index a1a4475..09dfe86 100644
--- a/zq-erp/src/main/resources/static/js/function/vip.js
+++ b/zq-erp/src/main/resources/static/js/function/vip.js
@@ -73,7 +73,6 @@
$("#levelName").html(loj.getString(0, "vipLevel.levelName"));
vipId = loj.getString(0, "id");
- updateHistory();
if (isActive) {
$(".isActive").removeAttr("disabled");
isActive = false;
@@ -83,25 +82,7 @@
}
}
-/**
- * 更新最近查询客户
- */
-function updateHistory() {
- $
- .AjaxProxy()
- .invoke(
- basePath + "/admin/showHistoryUser",
- function (loj) {
- var html = "";
- for (var i = 0; i < loj.getRowCount(); i++) {
- html += "<li class='list-group-item'onclick='selectHistory(\""
- + loj.getString(i, "phone")
- + "\")' >"
- + loj.getString(i, "vipName") + "</li>";
- }
- $("#historyList").html(html);
- });
-}
+
/*
* 点击切换最近查询用户
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html
index 6b949bb..ae7dd75 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html
@@ -268,7 +268,6 @@
$("#userList").hide();
}
});
- updateHistory();
$("#userList").mouseleave(function () {
$(this).hide();
})
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-card.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-card.html
deleted file mode 100644
index 66fd807..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-card.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingCRMcard.css}">
-<style type="text/css">
-body {
- background: #eee;
-}
-
-.am-list-news {
- margin: 1.6rem 1.6rem;
-}
-
-.am-list-news li {
- margin: 1.0rem 0;
-}
-
-.am-list-news-default .am-list>li {
- border: none;
- border-top: 5px solid red;
- border-radius: 5px;
-}
-
-.half-card {
- width: 1rem;
- height: 1rem;
- border-radius: 50%;
- position: relative;
- background: #eee;
- left: -0.5rem;
- z-index: 10;
-}
-
-.half-card2 {
- width: 1rem;
- height: 1rem;
- border-radius: 50%;
- position: relative;
- background: #eee;
- float: right;
- left: 0.5rem;
- top: -1.1rem;
- z-index: 10;
-}
-
-.am-list-date {
- top: 0;
- right: 2rem;
-}
-
-.line-card {
- size: 1px;
- width: 100%;
- top: -1.5rem;
- position: relative;
- border: none;
- height: 1px;
- background: #333;
- background-image: linear-gradient(to right, #ccc, #EFE3E3, #F51515);
- margin: 0;
-}
-
-.card-name {
- padding: 0 1rem;
- height: 4rem;
- line-height: 4rem;
-}
-
-.am-list-item-text {
- height: 3rem;
- padding: 0 1rem;
-}
-</style>
-</head>
-<body>
- <!-- 会员注册页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w am-header-fixed back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM-account}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 会员卡信息 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="user.html" class=""> <i
- class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <div class="am-list-news-bd">
-
- <div th:if="${#lists.size(session.lookVipInfo.cards) eq 0}" class="no-msg">该会员无卡!</div>
-
- <ul th:if="${#lists.size(session.lookVipInfo.cards) ne 0}" class="am-list">
- <li th:each="item:${session.lookVipInfo.cards }" class="am-g am-list-item-dated">
- <div class="card-name">
- <a href="##" class="am-list-item-hd " th:text="${item.cardName }"></a>
- <span class="am-list-date">
- 余额: <span th:text="${item.money }" ></span> 余次:
- <strong th:if="${item.lastCount >100000}" th:text="不限"></strong>
- <strong th:if="${item.lastCount < 100000}" th:text="${item.lastCount}"></strong>
- </span>
- </div>
- <div class="half-card"></div>
- <div class="half-card2"></div>
- <hr class="line-card"></hr>
- <div class="am-list-item-text"
- th:value="'失效时间'+${#dates.format(item.failTime,'yyyy-MM-dd')}" >
- </div>
- </li>
- </ul>
- </div>
- </div>
-
-
-
-
-
-
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
-
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-choice.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-choice.html
deleted file mode 100644
index 34fed68..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-choice.html
+++ /dev/null
@@ -1,176 +0,0 @@
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-
-
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-
-</head>
-<script>
-
-</script>
-
-
-<body >
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="back-m1 am-header color-w am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/CRM-account}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">点牌客户 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1">
- <form class="am-form am-form-horizontal" action="">
- <!-- <input autocomplete="off" class="am-form-field am-input-sm" type="text" placeholder="">
- <br/> -->
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-1 ">
- <span> </span>
- </div>
- <div class="am-u-sm-8 search">
- <input autocomplete="off" type="text" class="searchIn" placeholder="用户姓名/手机号"/>
- </div>
- <div class="am-u-sm-3 btn">
- <button class="am-btn am-btn-default am-radius searchBtn" >搜索</button>
- </div>
-
- </div>
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">客户姓名</h2>
- </div>
- <div class="am-u-sm-5 ">
- <h2 class="am-list-news-more am-fr">电话 </h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">等级 </h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">操作 </h2>
- </div>
-
- </div>
-
- <div class="am-list-news-bd">
- <ul class="am-list">
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
-
-
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd" th:href="@{/admin/redirect/CRM-account-msg}">详情</a>
- </div>
-
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
-
-
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd">详情</a>
- </div>
-
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd">详情</a>
- </div>
-
- </li>
- </ul>
- </div>
-
- </div>
-
-
- <!-- 商品展示结束 -->
- <!-- 测试 -->
-
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
-
-
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-detail.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-detail.html
deleted file mode 100644
index 5a97c3e..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-detail.html
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text=" ${webTitle }"></title>
-
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingCRMdetail.css}">
-
-</head>
-<script>
-
-</script>
-
-
-<body >
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/CRM-account}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 会员详细信息 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <form class="am-form am-form-horizontal" id="myForm" name="hobbyform" onsubmit="javascripr:return false;">
- <div class="main main1">
- <section data-am-widget="accordion"
- class="am-accordion am-accordion-gapped" data-am-accordion='{ }'>
- <input autocomplete="off" type="hidden" name="id" th:value="${session.lookVipInfo.id }">
-
- <c:set var="num" value="0"/>
- <c:forEach items="${questions}" var="items" varStatus="st" >
- <dl class="am-accordion-item am-active">
- <dt class="am-accordion-title">${items[0].category}</dt>
- <dd class="am-accordion-bd am-collapse am-in">
- <c:forEach items="${items}" var="item" varStatus="itemSt">
- <div class="am-accordion-content">
- <input autocomplete="off" type="hidden" name="vipAnswers[${num }].quesionId" th:value="${item.id }">
- <input autocomplete="off" type="hidden" name="vipAnswers[${num }].vipId" th:value="${session.lookVipInfo.id }">
- <div class="am-input-group am-form-group am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">${item.question}</span>
- </div>
- <c:choose>
- <c:when test="${item.type eq '标题' }">
- </c:when>
- <c:when test="${item.type eq '长文本' }">
- <div class="am-u-sm-8">
- <textarea class="form-control" name="vipAnswers[${num }].answerText" cols="30px">${item.vipAnswer.answerText }</textarea>
- </div>
- </c:when>
- <c:when test="${item.type eq '文本' }">
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="form-control" name="vipAnswers[${num }].answerText" th:value="${item.vipAnswer.answerText }" />
- </div>
- <c:set var="index" th:value="${index+1}" ></c:set>
- </c:when>
- <c:otherwise>
- <div class="am-u-sm-8">
- <select name="vipAnswers[${num }].answerId" class="form-control select2" <c:if test="${item.type eq '多选'}">multiple="multiple">
- <c:if test="${item.type eq '单选'}">
- <option value="">--请选择-- </option>
-
-
- <c:forEach items="${item.answers }" var="answer" >
- <c:set var="temp" th:value="${answer.id}"/>
- <option th:value="${answer.id}" <c:if test="${fn:contains(item.vipAnswer.answerId,temp) }">selected="selected">
- ${answer.answer} </option>
- </c:forEach>
- </select>
- </div>
- </c:otherwise>
- </c:choose>
- </div>
- </div>
- <c:set var="num" th:value="${num+1 }"/>
- </c:forEach>
- </dd>
- </dl>
- </c:forEach>
-
-
-
- </section>
-
- </div>
- </form>
-
- </div>
- <div class="inputBtn">
- <input autocomplete="off" type="button" onclick="myForm.submit()"
- class="am-btn btn-m1 am-radius am-btn-block" value="保存"></input>
- </div>
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
-
-
- <script>
- $(".select2").select2();
- /* 会员爱好表单条件 */
- var myForm = MForm.initForm({
- invokeUrl : basePath+"/admin/customer/addOrModifyVipAnswer",
- formSelecter : "#myForm",
- afterSubmit : function(loj) {
- layer.open({
- shade:false,
- content : '操作成功',
- className : 'showBox',
- time : 1,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/CRM-account");
- }
- });
- }
- });
-
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-follow-add.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-follow-add.html
deleted file mode 100644
index 13621db..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-follow-add.html
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-
-
-
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingUserVip.css}">
- <style type="text/css">
- .loadingbig{
- max-width: 100%;
- }
-
-</style>
-
-</head>
-<script>
-
-</script>
-
-
-<body>
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM-account-follow}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 新增跟进记录 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main2" >
- <form class="am-form am-form-horizontal" method="post" id="dataform" onsubmit="javascripr:return false;">
-
- <input autocomplete="off" type="hidden" name="id" th:value="${obj?.id}" >
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label ">会员姓名</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field " th:value="${session.lookVipInfo.vipName}"
- readonly="readonly" />
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">项目</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" th:value="${obj?.info0}" class="am-form-field " name="info0" >
- </div>
- </div>
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">导入仪器</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" th:value="${obj?.info1}" class="am-form-field " name="info1" >
- </div>
- </div>
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">产品搭配</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" th:value="${obj?.info2}" class="am-form-field " name="info2" >
- </div>
- </div>
-
-
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">家居产品</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" th:value="${obj?.info3}" class="am-form-field " name="info3" >
- </div>
- </div>
-
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">回访时间</span>
- </div>
- <div class="am-u-sm-8">
-
- <input autocomplete="off" type="date" th:value="${#dates.format(obj?.followTime,'yyyy-MM-dd')}" id="voInDate" name="followTime" class="am-form-field " />
- </div>
- </div>
-
-
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">肌肤现状</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" th:value="${obj?.info5}" class="am-form-field " dataType="*1-100" name="info5" >
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">效果图1</span>
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-12">
- <input autocomplete="off" th:value="${obj?.info6}" name="info6" id="img1"
- class="form-control upload-input" type="text" /> <a
- class="btn btn-primary radius upload-a">选择图片
- </a>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">效果图2</span>
- </div>
-
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
-
- <div class="am-u-sm-12">
- <input autocomplete="off" th:value="${obj?.info7}" name="info7" id="img2"
- class="form-control upload-input" type="text" /> <a
- class="btn btn-primary radius upload-a">选择图片
- </a>
- </div>
- </div>
-
-
-
- <div class="inputBtn">
- <input autocomplete="off" type="button" onclick="myForm.submit()" class="am-btn btn-m1 am-radius am-btn-block" value="保存"></input>
- </div>
- <!-- 测试 -->
-
- </form>
- </div>
- </div>
-
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script th:src="@{/js/systools/AjaxProxyVue.js}"></script>
-
-
- <script>
- MTools.initImgUpload(".upload-input");
- var myForm = MForm.initForm({
- invokeUrl : basePath+"/admin/serviceRecord/addOrModify",
- beforeSubmit:function(){
-
- },
- afterSubmit : function(loj) {
-
- var msg = '';
- if (loj.attr("result").status == '200') {
- msg = '添加成功';
- layer.open({
- shade : false,
- content : msg,
- className : 'showBox',
- time : 1,
- end : function(elem) {
- MTools.redirect( basePath+"/admin/redirect/hive/mobile/CRM-account-follow");
- }
- });
- }
- }
- });
-
-
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-follow.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-follow.html
deleted file mode 100644
index 19e830e..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-follow.html
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingCRMaccount-service.css}">
-<!-- <style type="text/css">
- .divList{
- _height:200px;
- min-height:100px;
- border:1px solid #000;
- }
-
-</style> -->
-
-</head>
-<script>
-
-</script>
-
-
-<body>
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM-account}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="" th:text="${session.lookVipInfo.vipName}+'跟进记录'"> </a>
- </h1>
-
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1">
-
- <div class="am-g">
- <div class="col-sm-12" style="text-align: right"><a th:href="@{/admin/redirect/hive/mobile/CRM-account-follow-add}"
- class="am-btn am-btn-primary">新增跟进记录</a></div>
- </div>
-
-
- <!-- 套餐表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default divList" style="margin-bottom: 60px">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g" id="ul_title">
- <!--带更多链接-->
- <div class="am-u-sm-4 ">
- <h2 class="am-list-news-more am-fr">计划跟进时间</h2>
- </div>
- <div class="am-u-sm-6 ">
- <h2 class="am-list-news-more am-fr">肌肤现状</h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">操作</h2>
- </div>
-
- </div>
-
- <div class="am-list-news-bd " >
- <ul class="am-list" id="showdataBox">
-
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px;margin-bottom: 100px">
-
- </div>
- </div>
-
-
-
- </div>
- </div>
- <form class="am-form" method="post"
- id="dataform" onsubmit="javascripr:return false;">
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" id="limit" name="limit" value="10" />
- </form>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
-
- <script>
- var delBtn="";
- </script>
-
- <script matrix:btn="servicefollow-dels" >
- delBtn='<a class="am-list-item-hd" onClick="del(\'VALUE\')" >删除</a>';
- </script>
-
-
- <script>
-
-
-
-
- /**
- 加载数据
- **/
- $(function(){
-
- var pageSize=$("#limit").val();
- var flag = $.query.get("flag");
- if(flag){
- $("#order-select").val(flag);
- }
- Pagination.init({
- url: basePath+"/admin/serviceRecord/showList",
- pageSize : pageSize,
- builderDate:function(loj){
- var html='';
- if(loj.getRowCount() >0){
- for(var i=0 ; i<loj.getRowCount(); i++ ){
- html+=' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left"> <div class="am-u-sm-4 "> <h3 class="am-list-item-hd">'
- +loj.getDateYMH(i,"followTime")
- +'</h3> </div> <div class="am-u-sm-6 "><h3 class="am-list-item-hd">'
- +loj.getString(i,"info5")
- +'</h3> </div> <div class="am-u-sm-2 ">'
- +'<a class="am-list-item-hd" href="'+basePath+'/admin/serviceRecord/editForm?id='+loj.getString(i,"id")+'" >编辑</a> '
- +delBtn.replace("VALUE",loj.getString(i,"id"))+'</div></li>';
- }
- }else{
- html ='<Div style="text-align: center;width:100%;">暂无跟进记录</div>'
- $("#pagingBox").hide();
- }
- return html;
- }
- }).serchDate();
- })
-
-
- function del(id){
- layer.open({
- content: '确认要删除这条记录吗？',
- btn: ['确认', '取消'],
- shadeClose: false,
- yes: function(){
- $.AjaxProxy({p:{keys:id}}).invoke( basePath+"/admin/serviceRecord/del",function(loj){
- layer.open({content: '删除成功', time: 1});
- Pagination.serchDate();
- });
-
- }
- });
- }
- </script>
-
-
-
-
-
-
-
- <!-- index js -->
-</body>
-</html>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-mealuse.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-mealuse.html
deleted file mode 100644
index 17cf4c8..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-mealuse.html
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href= "@{/css/dingOrderUseNew.css}">
-<link rel="stylesheet" type="text/css"
- th:href= "@{/plugin/LCalendar/src/css/LCalendar.css}">
-
-</head>
-
-<body>
- <!-- 购物车页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM-account}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 套餐项目情况 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="###" class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 购物车表单开始 -->
- <div class="main main1">
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <div class="am-list-news-bd">
- <ul class="am-list" id="ul_order_use">
-
- </ul>
- </div>
- </div>
- </div>
-
- <!-- 购物车表单结束 -->
-
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/LCalendar/src/js/LCalendar.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- /* $('.datetimepicker').datetimepicker({
- format : "yyyy-mm-dd hh:ii",
- autoclose: true,
- }); */
-
- $(function() {
- MTools.autoFullSelect();
- $(".check").uCheck('enable');
- $
- .AjaxProxy()
- .invoke(
- basePath+"/admin/projUser/findAllUseService",
- function(loj) {
- var html = "";
- var taocanProjMap = loj.attr("result")["mapInfo"].taocanProjMap; //mapInfo对象
-
-
- if (loj.getRowCount() > 0 || taocanProjMap.length> 0) {
-
- //循环取出套餐的信息
-
- for ( var i=0 ; i<taocanProjMap.length;i++ ) {
- var taocanInfo =taocanProjMap[i];
- html += '<div class="card">'
- + '<li class="lic am-g " >'
- + '<div class=" am-u-sm-8 am-list-main"><h2 class="am-list-item-hd">'
- + taocanInfo.tcName
- + '</h2></div><div class=" am-u-sm-3 am-list-main"><h3 class="am-list-item-hd">余额 ¥'
- + taocanInfo.balance
- + '</h3></li>';
-
- //循环取出一个套餐中包含的项目
- for (var j = 0; j < taocanInfo.taocanProjUse.length; j++) {
-
- var projUse = taocanInfo.taocanProjUse[j];
-
- html += '<li class="lic am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left " >'
-
- + '<div class=" am-u-sm-4 "><h3 class="am-list-item-hd">'
- + projUse.name
- + '</h3></div><div class=" am-u-sm-3 "><h3 class="am-list-item-hd">余额¥'
- + projUse.balance
- + '</h3></div><div class="am-u-sm-3 "> <span>余'
- + projUse.surplusCount
- + '次</span></div></li>';
- }
- html += '<div class="taocan"></div>'
- + '</div>';
- }
- //循环取出项目列表
- for (var i = 0; i < loj.getRowCount(); i++) {
-
- html += '<div class="card">'
- + ' <li class=" lic am-g " >'
-
- + '<div class=" am-u-sm-4 am-list-main"><h3 class="am-list-item-hd">'
- + loj.getString(i, "projInfo").projName
- + '</h3></div><div class=" am-u-sm-3 am-list-main"><h3 class="am-list-item-hd">余额¥'
- + loj.getString(i, "balance")
- + '</h3></div><div class="am-u-sm-3 am-list-thumb"> <span>余'
- + loj.getString(i,
- "surplusCount")
- + '次</span></div></li>'
- + '<div class="taocan"></div></div>';
- }
-
- } else {
- html = '<div class="empty-car">'
- + '<p id="empty-car">没有可消耗项目</p>'
- + '<p>'
- + '<a href='+basePath+'"/admin/redirect/hive/mobile/order-list"> 马上去选购! </a>'
- + '</p>'
- + '</div>'
- $("#submitBtn").hide();
- }
- //显示数据
- $("#ul_order_use").html(html);
- });
-
- })
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-msg.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-msg.html
deleted file mode 100644
index c80fda5..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-msg.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingUserVip.css}">
-
-</head>
-<body>
- <!-- 会员注册页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM-account}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">
- 会员信息
- </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="user.html" class="">
-
- <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
-
-
- <!-- 会员注册表单开始 -->
- <div class="main main2" >
- <form class="am-form am-form-horizontal" method="post" id="dataform" onsubmit="javascripr:return false;">
-
- <input autocomplete="off" type="hidden" th:value="${session.lookVipInfo.id }" name="id">
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">会员姓名</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${session.lookVipInfo.vipName }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">会员电话</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" id="input-bottom" th:value="${session.lookVipInfo.phone }" placeholder="会员手机号" name="phone"
- type="text" dataType="m" nullmsg="请填写会员手机号" errormsg="请填写正确手机号"/>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">会员地址</span>
- </div>
-
- <div class="am-u-sm-8">
- <input autocomplete="off" id="input-bottom" th:value="${session.lookVipInfo.addr }" placeholder="会员地址" name="addr"
- type="text" dataType="*" nullmsg="请填写会员地址"/>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">会员星座</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${session.lookVipInfo.constell }"></span>
- </div>
- </div>
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">会员生肖</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${session.lookVipInfo.animalSign }"></span>
- </div>
- </div>
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">到店途径</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${session.lookVipInfo.arrivalWay }"></span>
- </div>
- </div>
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g" >
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">性 别</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${session.lookVipInfo.sex }"></span>
- </div>
- </div>
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">会员类型</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${session.lookVipInfo.vipType }">
- </span>
- </div>
- </div>
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">会员生日</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:value="${#dates.format(session.lookVipInfo.birthday1, 'yyyy-MM-dd')}"></span>
- </div>
- </div>
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">疾病历史</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${session.lookVipInfo.disease }">
- </span>
- </div>
- </div>
- <div class="inputBtn">
- <input autocomplete="off" type="button" onclick="myForm.submit()" class="am-btn btn-m1 am-radius am-btn-block" value="保存"></input>
- </div>
-
- </form>
- </div>
- <!-- 会员到访表单结束 -->
-
-
-
-
-
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
-/*会员注册判断 */
-var myForm = MForm.initForm({
- invokeUrl : basePath+"/admin/vipInfo/modifyVip",
- afterSubmit : function(loj) {
- layer.open({
- shade:false,
- content : '保存成功',
- className : 'showBox',
- time : 1,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/hive/mobile/CRM-account-my");
- }
- });
- }
-});
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-my.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-my.html
deleted file mode 100644
index 2bfecaa..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-my.html
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-<style type="text/css">
-.m_ul{
- list-style: none;
-}
-
-.m_ul li span{
-margin-left: 2em;
-}
-</style>
-</head>
-
-
-
-<body>
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM?foot=3}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 我的客户 </a>
- </h1>
-
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1" id="main" style="display: none;">
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-6 margin-b1">
- <select class="form-control autoFull border"
- th:data-url="@{/admin/vipInfo/findVipLevel}"
- data-filed="levelName"
- name="levelId">
- <option value=''>等级</option>
- </select>
- </div>
-
- <!-- <label class="col-sm-2 control-label">会员活跃度</label> -->
- <div class="am-u-sm-6 margin-b1" >
- <select class="form-control autoFull border"
- th:data-url="@{/admin/dataDictionary/showDataDictionary}"
- data-param="{type:'会员活跃度'}"
- data-value="name"
- name="vipState">
- <option value=''>活跃度</option>
- </select>
- </div>
- <div class="am-u-sm-6 margin-b1">
- <select name="select" id="select" onchange="option()">
- <option value=''>--类型选择--</option>
- <option value="absentDay">未到店日期</option>
- <option value="birthdays">生日</option>
- <option value="followDays">跟进</option>
- <option value="appointDays">预约</option>
- </select>
- </div>
- <div class="am-u-sm-6 margin-b1">
- <select name="time" id="time">
- <option value='' class="option time">--时间选择--</option>
- <option value="3" class="option option1 ">3天</option>
- <option value="7" class="option option1">7天</option>
- <option value="14" class="option option1">14天</option>
- <option value="1" class="option option2">今天</option>
- <option value="3" class="option option2">3天内</option>
- <option value="30" class="option option2">一个月</option>
- </select>
- </div>
-
- <div class="am-u-sm-8 ">
- <input autocomplete="off" type="text" class="searchIn" name="keyWord" placeholder="用户姓名/手机号" />
-
- </div>
- <div class="am-u-sm-4 ">
- <button type="button"
- class="am-btn am-btn-default am-radius searchBtn"
- onclick="Pagination.serchDate()">搜索</button>
- </div>
-
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" name="limit" id="limit" value="10" />
- </div>
-
-
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">客户姓名</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">电话</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">会员等级</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">操作</h2>
- </div>
- </div>
- <div class="am-list-news-bd">
- <ul class="am-list am-list-striped" id="showdataBox">
-
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px"></div>
- </div>
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
- /**
- 加载数据
- **/
- $(function() {
- var pageSize=$("#limit").val();
- Pagination
- .init(
- {
- url : basePath+"/admin/customer/showMyCustomerByModel",
- pageSize : pageSize,
- builderDate : function(loj) {
- if (loj.getRowCount() > 0) {
- $("#main").show();
- var html = "";
- //构建数据
- for (var i = 0; i < loj.getRowCount(); i++) {
- var phone=' ';
- var tphone=' ';
- if(loj.getString(i, "phone")&&loj.getString(i, "phone")!=''){
- phone=loj.getString(i, "phone");
- if(phone.length=11){
- tphone=phone.substring(0,3)+"****"+phone.substring(8,11);
- }else{
- tphone=phone;
- }
- }
-
- html += ' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">'+ loj.getString(i,"vipName") + '</h3> </div>'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + tphone + '</h3> </div> '
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' +(loj.getString(i, "vipLevel").levelName==null?' ':loj.getString(i, "vipLevel").levelName) + '</h3> </div> '
- +'<div class="am-u-sm-3 "><a class="am-list-item-hd" href="tel:'+phone+'">拨号</a> <a class="am-list-item-hd" href="sms:'+phone+'">短信</a> <a class="am-list-item-hd" href="'+basePath+'/admin/customer/toVipInfoSearch?id='+ loj.getString(i, "id")+ '&lookInfo=0">详情</a></div></li>';
- }
- return html;
- } else {
- $("#pagingBox").hide();
-
-
- }
- }
- }).serchDate();
-
-
- //筛选点击事件
-
-
-
- $(".m_ul li span").click(function(){
-
- var normal="am-badge am-badge-secondary am-radius";
- var selected="am-badge am-badge-warning am-radius";
- var myAttr= $(this).attr("class");
- if(myAttr==selected){
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",normal);
- Pagination.serchDate();
- }else{
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",selected);
- onserch($(this).attr("kind"),$(this).attr("day"))
- }
-
- });
-
- //下拉框
- MTools.autoFullSelect();
- //
- //style="display:none"
- $(".option1").css("display","none");
- $(".option2").css("display","none");
-
- }
- );
- function option(){
- $(".option").removeAttr("selected");
- $('.time').attr('selected', true);
- if($("#select").val() != null && $("#select").val() != ""){
- if($("#select").val() != "absentDay"){
- $(".option1").css("display","none");
- $(".option2").css("display","block");
- }else{
- $(".option2").css("display","none");
- $(".option1").css("display","block");
- }
- }else{
- $(".option1").css("display","none");
- $(".option2").css("display","none");
- }
- }
-
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-potential.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-potential.html
deleted file mode 100644
index f536b1a..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-potential.html
+++ /dev/null
@@ -1,184 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-
-</head>
-<script>
-
-</script>
-
-
-<body >
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/CRM-account}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 潜在客户 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1">
- <form class="am-form am-form-horizontal" action="">
- <!-- <input autocomplete="off" class="am-form-field am-input-sm" type="text" placeholder="">
- <br/> -->
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-1 ">
- <span> </span>
- </div>
- <div class="am-u-sm-8 search">
- <input autocomplete="off" type="text" class="searchIn" placeholder="用户姓名/手机号"/>
- </div>
- <div class="am-u-sm-3 btn">
- <button class="am-btn am-btn-default am-radius searchBtn" >搜索</button>
- </div>
-
- </div>
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">客户姓名</h2>
- </div>
- <div class="am-u-sm-5 ">
- <h2 class="am-list-news-more am-fr">电话 </h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">等级 </h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">操作 </h2>
- </div>
-
- </div>
-
- <div class="am-list-news-bd">
- <ul class="am-list">
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
-
-
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd" th:href="@{/admin/redirect/CRM-account-msg}">详情</a>
- </div>
-
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
-
-
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd">详情</a>
- </div>
-
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
-
-
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd">详情</a>
- </div>
-
- </li>
- </ul>
- </div>
-
- </div>
-
-
- <!-- 商品展示结束 -->
- <!-- 测试 -->
-
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
-
-
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-service.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-service.html
deleted file mode 100644
index 1cc29ab..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-service.html
+++ /dev/null
@@ -1,186 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingCRMaccount-service.css}">
-
-</head>
-<script>
-
-</script>
-
-
-<body >
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/CRM-account}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 服务记录 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1">
-
-
-
- <!-- 套餐表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">服务人</h2>
- </div>
- <div class="am-u-sm-4 ">
- <h2 class="am-list-news-more am-fr">跟进时间</h2>
- </div>
- <div class="am-u-sm-5 ">
- <h2 class="am-list-news-more am-fr">服务项目</h2>
- </div>
-
- </div>
- <div class="am-list-news-bd">
- <ul class="am-list" id="showdataBox">
- <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <span class="am-list-item-hd">罗总</span>
- </div>
- <div class="am-u-sm-4 ">
- <span class="am-list-item-hd">1993/12/01</span>
- </div>
- <div class="am-u-sm-5 ">
- <span class="am-list-item-hd">大保健</span>
- </div>
- </li>
- <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <span class="am-list-item-hd">丁川</span>
- </div>
- <div class="am-u-sm-4 ">
- <span class="am-list-item-hd">1999/02/12</span>
- </div>
- <div class="am-u-sm-5 ">
- <span class="am-list-item-hd">大保健</span>
- </div>
- </li>
- </ul>
- </div>
-
- <div id="pagingBox" >
- </div>
- </div>
- <div data-am-widget="navbar" class="am-navbar am-cf am-navbar-default " id="">
- <ul class="am-navbar-nav am-cf am-avg-sm-1">
- <li >
- <div>
- <form class="am-form">
-
-
-
- <div class="am-form-group ">
-
-
- <span class="color-w">服务时间</span> <button type="submit" class="am-btn am-btn-default btn-add">添加</button>
- <input autocomplete="off" type="date" class="" id="doc-ipt-email-1" >
-
-
-
-
- <span class="color-w">服务项目</span>
- <select id="doc-select-1">
- <option value="option1">大保健</option>
- <option value="option2">小暴击</option>
- <option value="option3">选项三</option>
- </select>
-
- </div>
-
-
-
- </form>
- </div>
- </li>
-
- </ul>
- </div>
-
- <!-- 商品展示结束 -->
- <!-- 测试 -->
-
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
- /**
- 加载数据
- **/
- /* $(function(){
- Pagination.init({url: basePath+"/admin/customer/showMyCustomer",
- builderDate:function(loj){
- var html="";
- //构建数据
- for(var i=0 ; i<loj.getRowCount(); i++ ){
- html+=' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left"> <div class="am-u-sm-3 "> <h3 class="am-list-item-hd">'
- +loj.getString(i,"vipName")
- +'</h3> </div> <div class="am-u-sm-4 "><h3 class="am-list-item-hd">'
- +loj.getString(i,"phone")
- +'</h3> </div> <div class="am-u-sm-3 "> <h3 class="am-list-item-hd">'
- +'待做'
- +'</h3> </div> <div class="am-u-sm-2 ">'
- +'<a class="am-list-item-hd" th:href="@{/admin/redirect/CRM-account?id='+loj.getString(i,"id")+'" >详情</a></div></li>';
- }
- return html;
- }
- }).serchDate();
- })
- */
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-turn.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-turn.html
deleted file mode 100644
index c6dbdc7..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-turn.html
+++ /dev/null
@@ -1,184 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-
-</head>
-<script>
-
-</script>
-
-
-<body >
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/CRM-account}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 轮牌客户 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1">
- <form class="am-form am-form-horizontal" action="">
- <!-- <input autocomplete="off" class="am-form-field am-input-sm" type="text" placeholder="">
- <br/> -->
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-1 ">
- <span> </span>
- </div>
- <div class="am-u-sm-8 search">
- <input autocomplete="off" type="text" class="searchIn" placeholder="用户姓名/手机号"/>
- </div>
- <div class="am-u-sm-3 btn">
- <button class="am-btn am-btn-default am-radius searchBtn" >搜索</button>
- </div>
-
- </div>
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">客户姓名</h2>
- </div>
- <div class="am-u-sm-5 ">
- <h2 class="am-list-news-more am-fr">电话 </h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">等级 </h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">操作 </h2>
- </div>
-
- </div>
-
- <div class="am-list-news-bd">
- <ul class="am-list">
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
-
-
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd" th:href="@{/admin/redirect/CRM-account-msg}">详情</a>
- </div>
-
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
-
-
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd">详情</a>
- </div>
-
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">张全蛋</h3>
- </div>
-
-
- <div class="am-u-sm-5 ">
- <h3 class="am-list-item-hd">15095828513</h3>
- </div>
- <div class="am-u-sm-2 ">
- <h3 class="am-list-item-hd">尊贵会</h3>
- </div>
- <div class="am-u-sm-2 ">
- <a class="am-list-item-hd">详情</a>
- </div>
-
- </li>
- </ul>
- </div>
-
- </div>
-
-
- <!-- 商品展示结束 -->
- <!-- 测试 -->
-
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
-
-
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account.html
deleted file mode 100644
index f7f90b0..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingCRMAccount.css}">
-
-</head>
-<body>
-<!-- 我的客户页面 -->
-<!-- 头部开始 -->
-<header data-am-widget="header" class="am-header color-w back-m1 ">
- <div class="am-header-left am-header-nav">
-
- <a th:if="${lookInfo >0}" th:href="@{/admin/redirect/hive/mobile/CRM-vipInfo-search}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
-
- <a th:if="${lookInfo <=0}" th:href="@{/admin/redirect/hive/mobile/CRM-account-my}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
-
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class="" th:text="${session.lookVipInfo.vipName}+'客户信息'"> </a>
- </h1>
- <!-- <div class="am-header-right am-header-nav">
- <a href="user.html" class=""> <i
- class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
-</header>
-<!-- 头部结束 -->
-<!-- 内容开始 -->
-<ul class="am-avg-sm-3 boxes" id="boxs">
-
- <li class="box box-1"><a
- th:href="@{/admin/redirect/hive/mobile/CRM-account-msg}"> <img
- th:src="@{/images/dingImg/jbmsg.png}"></img><br>
- <small class="boxs">会员基本信息</small>
- </a></li>
-
-
- <li class="box box-2"><a
- th:href="@{/admin/redirect/hive/mobile/CRM-account-card}"> <img
- th:src="@{/images/dingImg/vipmsg.png}"></img><br>
- <small class="boxs">会员卡信息</small>
- </a></li>
-
-
- <li class="box box-3"><a
- th:href="@{/admin/redirect/hive/mobile/CRM-account-mealuse}"> <img
- th:src="@{/images/dingImg/tcuse.png}"></img><br>
- <small class="boxs">套餐项目使用情况</small>
- </a></li>
-
-
- <li class="box box-5"><a
- th:href="'/admin/customer/showVipMoneyCardList?vipId='+${session.lookVipInfo?.id}"> <img
- th:src="@{/images/dingImg/xjdd.png}"></img><br> <small
- class="boxs">充值卡使用情况</small>
- </a></li>
- <li class="box box-6">
- <a th:href="@{/admin/redirect/hive/mobile/CRM-account-follow}"> <img
- th:src="@{/images/dingImg/gjjl.png}"><br> <small class="boxs">跟进记录</small>
- </a></li>
- <li class="box box-6">
- <a th:href="@{/admin/redirect/hive/mobile/vip-archives?id=__${session.lookVipInfo.id}__}"> <img
- th:src="@{/images/dingImg/gjjl.png}"><br> <small class="boxs">会员档案</small>
- </a></li>
-</ul>
-<!-- 内容结束 -->
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
- $(function () {
- var count = $("#boxs").find("li").length;
- var index = count % 3;
- if (index == 1) {
- $("#boxs").append(" <li class='box'>" + "</li>");
- $("#boxs").append(" <li class='box'>" + "</li>");
-
- }
- if (index == 2) {
- $("#boxs").append(" <li class='box'>" + "</li>");
-
- }
-
- })
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-card-user.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-card-user.html
deleted file mode 100644
index 888adfe..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-card-user.html
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <!-- Tile icon for Win8 (144x144 + tile color) -->
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingOrderMsg3.css}">
-
-</head>
-<body>
-<!-- 套餐详情页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a href="javascript:history.back(-1)" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class="">
- 充值卡使用详情
- </a>
- </h1>
- </header>
- <!-- 头部结束 -->
- <div class=" main1 all" >
- <div data-am-widget="list_news" class="am-list-news am-list-news-default" >
- <!-- 项目详情 -->
- <div th:each="item:${list}" class="am-panel am-panel-secondary" id="vipLevel">
- <div class="am-panel-hd">
- <h2 class="am-panel-title" th:text="${item.cardName}" ></h2>
- <span class="down down1" ></span>
- </div>
- <div class="vipMsg">
- <ul class="am-list am-list-static am-list-border" id="projDetails">
- <li th:text="'总次数:'+${item.useTotal }"></li>
- <li th:text="'剩余次数:'+${item.lastCount }"></li>
- <li th:text="'本金:'+${item.realMoney }"></li>
- <li th:text="'赠送金额:'+${item.giftMoney }"></li>
- <li th:text="'来源:'+${item.source }"></li>
- <li th:text="'状态:'+${item.status }"></li>
- <li th:text="'到期时间: '+${#dates.format(item.failTime,'yyyy-MM-dd')}" > </li>
- </ul>
- </div>
- </div>
- <!-- 项目详情结束 -->
- <input autocomplete="off" type="hidden" id="hidval" value="0">
- </div>
- </div>
- <!-- 客户到访表单结束 -->
-
-
-
-
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
-$(function () {
- $("#vipLevel").bind("click", function () {
- if ($("#hidval").val() == 1) {
- $(".down1").css("transform","rotate(0deg)");
- $(".vipMsg").slideUp(500,function(){
- $("#hidval").val(0);
-
- })
- } else {
- $(".down1").css("transform","rotate(180deg)");
- $(".vipMsg").slideDown(500,function(){
- $("#hidval").val(1);
- })
- }
- })
-});
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-search.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-search.html
deleted file mode 100644
index 24d6d0d..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-search.html
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href= "@{/css/dingCRMAccount.css}">
-
-</head>
-<body>
- <!-- 我的客户页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 ">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/CRM-vipInfo-search}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 我的客户 </a>
- </h1>
- <!-- <div class="am-header-right am-header-nav">
- <a href="user.html" class=""> <i
- class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
- <!-- 内容开始 -->
- <ul class="am-avg-sm-3 boxes" id="boxs">
- <matrix:fn value="accountMsg">
- <li class="box box-1"><a
- th:href="@{/admin/redirect/CRM-account-msg}"> <img
- th:src="@{/images/dingImg/jbmsg.png}"></img><br>
- <small class="boxs">会员基本信息</small>
- </a></li>
-
- <matrix:fn value="vipInfoMsg">
- <li class="box box-5"><a
- th:href="@{/admin/customer/findVipDetailByVipId}">
- <img th:src="@{/images/dingImg/xxmsg.png}"></img><br>
- <small class="boxs">会员详细信息</small>
- </a></li>
-
- <matrix:fn value="vipCardMsg">
- <li class="box box-2"><a
- th:href="@{/admin/redirect/CRM-account-card"> <img
- th:src="@{/images/dingImg/vipmsg.png}"></img><br>
- <small class="boxs">会员卡信息</small>
- </a></li>
-
- <matrix:fn value="mealuse">
- <li class="box box-3"><a
- th:href="@{/admin/redirect/CRM-account-mealuse"> <img
- th:src="@{/images/dingImg/tcuse.png}"></img><br>
- <small class="boxs">套餐项目使用情况</small>
- </a></li>
-
- <matrix:fn value="CRMAccountFollow">
- <li class="box box-5"><a
- th:href="@{/admin/redirect/CRM-account-follow"> <img
- th:src="@{/images/dingImg/gjjl.png}"></img><br> <small
- class="boxs">跟进记录</small>
- </a></li>
-
- <li class="box box-6"><a>
-
- </a></li>
- </ul>
- <!-- 内容结束 -->
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- $(function(){
- var count=$("#boxs").find("li").length;
- var index=count%3;
- if(index==1){
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
-
- }
- if(index==2){
- $("#boxs").append(" <li class='box'>"+"</li>");
-
- }
-
- })
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-vip.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-vip.html
deleted file mode 100644
index 3b0e67d..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-vip.html
+++ /dev/null
@@ -1,245 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingUserVip.css}">
-
-</head>
-<body>
- <!-- 会员注册页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM?foot=3}" class="">
-
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">
- 会员注册
- </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="user.html" class="">
-
- <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
-
-
- <!-- 会员注册表单开始 -->
- <div class="main main2" >
- <form class="am-form am-form-horizontal" method="post" id="dataform" onsubmit="javascripr:return false;">
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label ">会员姓名</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field " name="vipName"
- placeholder="会员姓名" dataType="*1-20" nullmsg="请填写会员姓名" errormsg="长度为1-20" />
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">会员电话</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field " name="phone" placeholder="手机号" nullmsg="请填写会员手机号" errormsg="请填写正确手机号">
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">会员地址</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field " name="addr"
- placeholder="会员地址" dataType="*" nullmsg="请填写会员地址">
- </div>
- </div>
-
-
-
- <!-- <input autocomplete="off" class="am-form-field am-input-sm" type="text" placeholder="">
- <br/> -->
-
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">到店途径</span>
- </div>
- <div class="am-u-sm-8">
- <select class="" name="arrivalWay" datatype="*" nullmsg="请选择到店途径">
- <option value="">-- 请选择到店途径 --</option>
- <option th:each="item:${ddtj}" th:value="${item.value}" th:text="${item.value}"></option>
- </select>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g bot" >
- <div class="am-u-sm-4">
- <span class="am-input-group-label">性 别</span>
- </div>
- <div class="am-u-sm-8">
- <select class=" " name="sex" datatype="*" nullmsg="请选择性别">
- <option value="女">女</option>
- <option value="男">男</option>
- </select>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">会员生日</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="date" id="voInDate" name="voBirthday"
- class="am-form-field " datatype="*" nullmsg="请选择会员生日" onchange="changeBirthday(this.value)"/>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">会员星座</span>
- </div>
- <div class="am-u-sm-8">
- <select name="constell" id="constell">
- <option value="">-- 请选择会员星座 --</option>
- <option th:each="item:${xz}" th:value="${item.name}" th:text="${item.name}"></option>
- </select>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label ">会员生肖</span>
- </div>
- <div class="am-u-sm-8">
- <select class=" " name="animalSign" id="animalSign" ><!-- datatype="*" nullmsg="请选择会员生肖" -->
- <option value="">-- 请选择会员生肖 --</option>
- <option th:each="item:${sx}" th:value="${item.name}" th:text="${item.name}"></option>
- </select>
- </div>
- </div>
- <div class="Validform_checktip"></div>
- <div class="am-form-group am-input-group am-input-group-primary am-g ">
- <div class="am-u-sm-4">
- <span class="am-input-group-label ">备 注</span>
- </div>
- <div class="am-u-sm-8">
- <textarea name="remark" class="border " clos="100" rows="3" warp="virtual"></textarea>
- </div>
- </div>
-
- <div class="inputBtn">
- <input autocomplete="off" type="button" onclick="myForm.submit()" class="am-btn btn-m1 am-radius am-btn-block" value="注册"></input>
- </div>
- <!-- 测试 -->
-
- </form>
- </div>
- <!-- 会员到访表单结束 -->
-
-
-
-
-
-<script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
-
- /*会员注册判断 */
-var myForm = MForm.initForm({
- invokeUrl : basePath+"/admin/vipInfo/registerVipInfo",
- afterSubmit : function(loj) {
- layer.open({
- shade:false,
- content : '注册成功',
- className : 'showBox',
- time : 1,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/hive/mobile/CRM?foot=3");
- }
- });
- }
-});
-
- function changeBirthday(birthday){
- /* $("#constell").removeAttr("option:selected"); */
- $.AjaxProxy({gs_parameter:{birthday1:birthday}}).invoke(
- basePath+"/admin/vipInfo/getBirthday" , function(loj){
- if(loj.getRowCount()>0){
- $("#constell option:selected").html(loj.getString(0,"constell"));
- $("#animalSign option:selected").html(loj.getString(0,"animalSign"));
-
- /* console.log($("#constell").find("option:selected").html());
- $("#constell").find("option[text="+loj.getString(0,"constell")+"]").attr("selected",true);
- $("#animalSign").find("option[text="+loj.getString(0,"animalSign")+"]").attr("selected",true); */
- }
- });
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-vipInfo-search.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-vipInfo-search.html
deleted file mode 100644
index 4dd0d14..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-vipInfo-search.html
+++ /dev/null
@@ -1,265 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href= "@{/css/dingOrderSearch.css}">
-<style type="text/css">
-#userList {
- height: 200px;
- overflow: scroll;
- overflow-x: hidden;
-}
-</style>
-</head>
-<body onkeypress="dosearch(event)">
- <header data-am-widget="header" class="am-header color-w back-m1 back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM?foot=3}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 会员搜索 </a>
- </h1>
- </header>
- <!-- 商品搜索页面 -->
- <div class="wrap">
- <div class="am-g">
- <div class="am-u-sm-9 no-right">
- <input autocomplete="off" id="userName" name="acctNo" type="text"
- class="am-form-field id-in am-dropdown-up" placeholder="请输入手机号或者姓名" />
- <ul id="userList" class="userList " style="display: none">
- </ul>
-
- </div>
- <div class="am-u-sm-3 no-left">
- <button class="am-btn am-btn-default" type="button"
- onclick="searchUser()">
- <span class="am-icon-search"></span>
- </button>
- </div>
- </div>
- </div>
-
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script>
- $(function() {
-
- $("#userName").bind('input propertychange', function() {
-
- var $input = $("#userName");
- if ($input.length < 1) {
- return false;
- }
-
- if ($input.val().length > 1) {
- $
- .AjaxProxy({
- p : {
- keyWord : $input.val(),
- },
- c : false,
- a : false,
- })
- .invoke(
- basePath+"/admin/vipInfo/findUserByPhoto",
- function(loj) {
- var html = "";
- if (loj.getRowCount() > 0) {
- for (var i = 0; i < loj
- .getRowCount(); i++) {
- html += '<li onclick="selectList(\''
- + loj
- .getString(
- i,
- 'phone')
- + '\')" >'
- + loj
- .getString(
- i,
- 'phone')
- + "-"
- + loj
- .getString(
- i,
- 'vipName')
- + "-"
- + loj
- .getString(
- i,
- 'vipNo')
- + '</li>';
- }
- $("#userList")
- .html(html)
- .show();
- } else {
- $("#userList")
- .empty()
- .hide();
- }
-
- });
- } else {
- $("#userList").hide();
- }
- });
-
- /* $("#userName")
- .keyup(
- function() {
- var $input = $("#userName");
- if ($input.length < 1) {
- return false;
- }
-
- if ($input.val().length > 1) {
- $
- .AjaxProxy({
- p : {
- keyWord : $input.val(),
- },
- c : false,
- a : false,
- })
- .invoke(
- basePath+"/admin/vipInfo/findUserByPhoto",
- function(loj) {
- var html = "";
- if (loj.getRowCount() > 0) {
- for (var i = 0; i < loj
- .getRowCount(); i++) {
- html += '<li onclick="selectList(\''
- + loj
- .getString(
- i,
- 'phone')
- + '\')" >'
- + loj
- .getString(
- i,
- 'phone')
- + "-"
- + loj
- .getString(
- i,
- 'vipName')
- + "-"
- + loj
- .getString(
- i,
- 'vipNo')
- + '</li>';
- }
- $("#userList")
- .html(html)
- .show();
- } else {
- $("#userList")
- .empty()
- .hide();
- }
-
- });
- } else {
- $("#userList").hide();
- }
- }); */
- })
- function searchUser() {
- if($("#userName").val().length<1){
- layer
- .open({
- shade : false,
- content : "请输入关键词后再查询",
- className : 'showBox',
- time : 1,
- });
- return false;
- }
- $.AjaxProxy({p : {keyWord : $("#userName").val(),},
- c : false,
- })
- .invoke(
- basePath+"/admin/vipInfo/findUserByPhoneOrNo",
- function(loj) {
- if (loj.getRowCount() > 0) {
- layer
- .open({
- shade : false,
- content : "查找成功",
- className : 'showBox',
- time : 1,
- end : function(elem) {
- MTools.redirect( basePath+"/admin/customer/toVipInfoSearch?id="+loj.getString(0,"id")+"&lookInfo=1");
- }
- });
-
- } else {
- layer.open({
- shade : false,
- content : "未查询到此会员",
- className : 'showBox',
- time : 2
- });
- }
- });
- }
- function dosearch(e) {
- if (e.keyCode == 13) {
- e.preventDefault();
- window.event.returnValue = false;
- searchUser();
- return false;
- }
- }
-
- function selectList(phone){
- $("#userList").hide();
- $("#userName").val(phone);
- searchUser();
- }
-
-
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit-info.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit-info.html
deleted file mode 100644
index cb567f2..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit-info.html
+++ /dev/null
@@ -1,213 +0,0 @@
-
-
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-<style type="text/css">
- .span1{
- white-space:nowrap;
- overflow:hidden;
- text-overflow:ellipsis;
- padding-top: 10px ;
- }
-
-</style>
-
-</head>
-<body>
- <!-- 会员注册页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM-visit-list}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">访问记录详情</a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="user.html" class=""> <i
- class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
-
-
- <!-- 会员注册表单开始 -->
- <div class="main3">
- <form class="form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">客户姓名</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.custName }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">客户手机号</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.custTel }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">客户编号</span>
- </div>
-
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.arrivalWay }"></span>
-
- </div>
- </div>
-
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">咨询版块</span>
- </div>
- <div class="am-u-sm-8 span1" th:text="${obj?.advicePlate }">
-
- </div>
- </div>
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">业务类型</span>
- </div>
- <div class="am-u-sm-8 span1" th:text="${obj?.businessType }">
-
- </div>
- </div>
-
-
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">拜访门店</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.shopName }"></span>
- </div>
- </div>
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">健康顾问</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.adviser }"></span>
- </div>
- </div>
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">美疗师</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.beautician }"></span>
- </div>
- </div>
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">是否老客</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.isOld }"></span>
- </div>
- </div>
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">备注</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.remark }"></span>
- </div>
- </div>
- <div th:if="${flag eq 1}" class="input-btn">
- <input autocomplete="off" type="button" onclick="myForm.submit()"
- class="am-btn btn-m1 am-radius am-btn-block" value="提交">
- </div>
- <!-- 测试 -->
- </form>
- </div>
- <!-- 会员到访表单结束 -->
-
-
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- var myForm = MForm.initForm({
- invokeUrl : basePath+"/admin/chance/modifyChange",
- afterSubmit : function(loj) {
- layer.open({
- shade:false,
- content : loj.getValue("info"),
- className : 'showBox',
- time : 2,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/hive/mobiel/CRM-business-no");
- }
- });
- },
-
- });
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit-list.html
deleted file mode 100644
index 083d838..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit-list.html
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-
-</head>
-<script>
-
-</script>
-
-
-<body >
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM?foot=3}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">到访记录</a>
- </h1>
- <!-- <div class="am-header-right am-header-nav">
- <a class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1" id="main" style="display: none;">
- <form class="am-form am-form-horizontal" id="dataform" onsubmit="javascripr:return false;">
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-1 ">
- <span> </span>
- </div>
- <div class="am-u-sm-8 search">
- <input autocomplete="off" type="text" class="searchIn" name="keyWord" placeholder="姓名/手机号/编号"/>
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" name="limit" value="10" />
- </div>
- <div class="am-u-sm-3 btn">
- <button type="button" class="am-btn am-btn-default am-radius searchBtn" onclick="Pagination.serchDate()">搜索</button>
- </div>
- </div>
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">姓名</h2>
- </div>
- <div class="am-u-sm-5 ">
- <h2 class="am-list-news-more am-fr">时间</h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">创建人</h2>
- </div>
-
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">操作</h2>
- </div>
- </div>
- <div class="am-list-news-bd">
- <ul class="am-list" id="showdataBox">
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px">
- </div>
- </div>
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
- /**
- 加载数据
- **/
- $(function(){
- Pagination.init({url: basePath+"/admin/vipInfo/visitorList",
- builderDate:function(loj){
- if(loj.getRowCount()>0){
- $("#main").show();
- var html="";
- //构建数据
- for(var i=0 ; i<loj.getRowCount(); i++ ){
- html+=' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left"> <div class="am-u-sm-3 "> <h3 class="am-list-item-hd">'
- +loj.getString(i,"custName")
- +'</h3> </div> <div class="am-u-sm-5 "><h3 class="am-list-item-hd">'
- +loj.getDate(i,"arrivalTime")
- +'</h3> </div> <div class="am-u-sm-2 "><h3 class="am-list-item-hd">'
- +loj.getString(i,"adviser")
- +'</h3> </div> <div class="am-u-sm-2 ">'
- +'<a class="am-list-item-hd" href="'+basePath+'/admin/vipInfo/lookVisitInfo?id='+loj.getString(i,"id")+'&flag=2" >详情</a></div></li>';
- }
- return html;
- }else{
- $("#pagingBox").hide();
-
- }
- }
- }).serchDate();
- })
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit.html
deleted file mode 100644
index 62d8ea1..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit.html
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu SiteFapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-
-</head>
-<body>
- <!-- 访客登记页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w am-header-fixed back-m1">
- <div class="am-header-left am-header-nav ">
- <a th:href="@{/admin/redirect/hive/mobile/CRM?foot=3}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 客户到访登记 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="user.html" class=""> <i
- class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
-
- <!-- 客户到访表单开始 -->
- <div class="main main2">
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
-
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">新客/老客</span>
- </div>
- <div class="am-u-sm-8" style="padding-top: 10px">
- <input autocomplete="off" class="static-form-control" name="isOld" type="radio" value="新客"/>新客
- <input autocomplete="off" class="static-form-control" name="isOld" type="radio" value="老客"/>老客
- </div>
- </div>
- <div class="Validform_checktip" style="margin-bottom: 10px"></div>
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">客户电话</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" onchange="getVipData('phone')" id="custTel" name="custTel" type="text" class="am-form-field " placeholder="输入电话后自动查询"
- datatype="m" nullmsg="请填写客户手机号" errormsg="请填写正确手机号">
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">客户姓名</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" name="custName" onchange="getVipData('vipName')" id="vipName" type="text" class="am-form-field "
- placeholder="客户姓名" datatype="*1-20" nullmsg="请填写客户姓名" errormsg="长度为1-20">
- </div>
- </div>
-
-
- <!-- 客户后来添加了一个会员编号，去掉了到店途径，因此性别这个字段实际存储的是会员编号 -->
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">会员编号</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" name="arrivalWay" onchange="getVipData('vipNo')" id="vipNo" type="text" class="am-form-field " placeholder="会员编号" ignore="ignore"
- datatype="*1-20" nullmsg="请填写会员编号" errormsg="长度为1-20">
- </div>
- </div>
-
-
-
- <div class="Validform_checktip"></div>
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g ">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">业务类型</span>
- </div>
- <div class="am-u-sm-8">
- <select class=" " name="businessType" multiple="multiple">
- <!-- <option value="">-- 请选择业务类型 --</option> -->
- <option th:each="item:${ywlx}" th:value="${item.name}" th:text="${item.name}"></option>
- </select>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
-
-
-
- <div class="am-form-group am-input-group am-input-group-primary am-g ">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">所属门店</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field" readonly="readonly" th:value="${shopNmae}">
- </div>
- </div>
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">到店途径</span>
- </div>
- <div class="am-u-sm-8">
- <select class=" " name="arrivalWay" datatype="*" nullmsg="请选择到店途径">
- <!-- 动态添加 -->
- <option value="">-- 请选择到店途径 --</option>
- <option th:each="item:${ddtj}" th:value="${item.name}" th:text="${item.name}"></option>
- </select>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
-
-
-
-
- <div class="am-form-group am-input-group am-input-group-primary am-g ">
- <div class="am-u-sm-4">
- <span class="am-input-group-label ">健康顾问</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field " readonly="readonly"
- th:value="${staffName}">
- </div>
- </div>
-
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">美 疗 师</span>
- </div>
- <div class="am-u-sm-8">
- <select class=" " name="beauticianId" datatype="*" nullmsg="请选择美疗师">
- <option value="">-- 请选择美疗师--</option>
- <option th:each="item:${mls}" th:value="${item.suId}" th:text="${item.suName}"></option>
- </select>
- </div>
- </div>
- <div class="Validform_checktip"></div>
-
- <div class="am-form-group am-input-group am-input-group-primary am-g ">
- <div class="am-u-sm-4">
- <span class="am-input-group-label ">备 注</span>
- </div>
- <div class="am-u-sm-8">
- <textarea name="remark" class="border " clos="100" rows="3" warp="virtual"></textarea>
- </div>
- </div>
- <div class="inputBtn">
- <input autocomplete="off" type="button" onclick="myForm.submit()"
- class="am-btn btn-m1 am-radius am-btn-block" value="提交"></input>
- </div>
- <!-- 测试 -->
-
- </form>
- </div>
-
-
- <!-- 客户到访表单结束 -->
-
-
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
-
- //自动填充
- function getVipData(key){
- if($("input[name='isOld']:checked").val() == "老客"){
- if(key=="phone"){
- $("#vipName").val("");
- $("#vipNo").val("");
- //$("input[name=isOld]").removeAttr("checked");
- queryInfo($("#custTel").val(),"","");
- }else if(key == "vipName"){
- $("#custTel").val("");
- $("#vipNo").val("");
- //$("input[name=isOld]").removeAttr("checked");
- queryInfo("",$("#vipName").val(),"");
- }else if(key == "vipNo"){
- $("#custTel").val("");
- $("#vipName").val("");
- //$("input[name=isOld]").removeAttr("checked");
- queryInfo("","",$("#vipNo").val());
- }
- }
- }
-
-
-
- function queryInfo(phone,vipName,vipNo){
- $.AjaxProxy({gs_parameter:{phone:phone,vipName:vipName,vipNo:vipNo}}).invoke(
- basePath+"/admin/vipInfo/findUserPho" , function(loj){
- if(loj.getRowCount()>0){
- $("#custTel").val(loj.getString(0,"phone"));
- $("#vipName").val(loj.getString(0,"vipName"));
- $("#vipNo").val(loj.getString(0,"vipNo"));
- //$("input[name=isOld]").get(1).checked=true;
- }
- });
- return false;
- }
-
-
-
-
- var myForm = MForm.initForm({
- invokeUrl : basePath+"/admin/vipInfo/visitorInfo",
- afterSubmit : function(loj) {
- layer.open({
- shade:false,
- content : '操作成功',
- className : 'showBox',
- time : 1,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/hive/mobile/CRM?foot=3");
- }
- });
- }
- });
- $(document).ready(function(){
-
- $("input[name=isOld]").get(0).checked=true;
- });
-
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM.html
deleted file mode 100644
index cacf522..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta http-equiv="Cache-Control" content="no-transform" />
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
-
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrder.css}">
-
-</head>
-<body>
- <!-- 商机管理页面-->
- <div class="wrap">
- <!-- 图片栏开始 -->
- <div data-am-widget="slider" class="am-slider am-slider-c2"
- data-am-slider='{"directionNav":false}'>
- <ul class="am-slides" >
- <li><img th:src="@{/images/dingImg/banner-img5.jpg}">
- <div class="am-slider-desc" th:text="${session.userInfo.shopName }"></div></li>
- </ul>
- </div>
- <!-- 图片结束 -->
- <!-- 表格部分开始 -->
- <ul class="am-avg-sm-4 boxes" id="boxs">
-
- <li class="box box-1"><a th:href="@{/admin/vipInfo/toVisitInfo}">
- <img th:src="@{/images/dingImg/dfdj2.png}"></img><br>
- <small class="boxs">到访登记</small>
- </a></li>
-
-
- <li class="box box-1"><a th:href="@{/admin/redirect/hive/mobile/CRM-visit-list}">
- <img th:src="@{/images/dingImg/khcx.png}"></img><br>
- <small class="boxs">到访记录</small>
- </a></li>
-
-
- <li class="box box-2"><a th:href="@{/admin/vipInfo/toRegister}">
- <img th:src="@{/images/dingImg/hyzc.png}"></img><br>
- <small class="boxs">会员注册</small>
- </a></li>
-
-
- <li class="box box-3"><a
- th:href="@{/admin/redirect/hive/mobile/CRM-account-my}"> <img
- th:src="@{/images/dingImg/wdkh.png}"></img><br> <small
- class="boxs">我的客户</small>
- </a></li>
-
- <li class="box box-3"><a
- th:href="@{/admin/redirect/hive/mobile/CRM-vipInfo-search}"> <img
- th:src="@{/images/dingImg/wdkh.png}"></img><br> <small
- class="boxs">客户查询</small>
- </a></li>
-
-
- </ul>
-
-
- <!-- foot开始 -->
- <div class="footr" th:fragment="footr">
- <div data-am-widget="navbar" class="am-navbar am-cf am-navbar-default "
- id="">
- <ul class="am-navbar-nav am-cf am-avg-sm-4">
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/personal?foot=1}"class="change1" >
- <img th:src="@{\images\dingImg\grzx2.png}" alt="个人中心"/>
- <span class="am-navbar-label ">个人中心</span>
- </a>
- </li>
-
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/CRM?foot=3}" class="change3">
- <img th:src="@{\images\dingImg\crm1.png}" alt="订单管理"/>
- <span class="am-navbar-label">CRM</span>
- </a>
- </li>
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/order?foot=4}" class="change4">
- <img th:src="@{\images\dingImg\ddgl1.png}" alt="商机管理"/>
- <span class="am-navbar-label">订单管理</span>
- </a>
- </li>
-
- </ul>
- </div>
- </div>
-
-
- <!-- foot结束 -->
- </div>
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- $(function() {
- $("#vipLevel").bind("click", function() {
- if ($("#hidval").val() == 1) {
- $(".down").css("transform", "rotate(0deg)");
- $(".vipMsg").slideUp(500, function() {
- $("#hidval").val(0);
-
- })
- } else {
- $(".down").css("transform", "rotate(180deg)");
- $(".vipMsg").slideDown(500, function() {
- $("#hidval").val(1);
- })
- }
- })
- });
- $(function(){
- var count=$("#boxs").find("li").length;
- var index=count%4;
- if(index==1){
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
- if(index==2){
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
- if(index==3){
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
- })
-
-
-
- $(function(){
- var id=$.query.get('foot');
-
-
-
-
- $(".change"+id).children("span").css('color','#dfbd88');
- switch(id){
- case 1:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/grzx.png');
-
- break;
-
- case 2:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/customer3.png');
-
- break;
- case 3:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/crm.png');
-
- break;
-
- case 4:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/ddgl.png');
-
- break;
- default:
- $(".change1").children("span").css('color','#dfbd88');
- $(".change1").children("img").attr('src',basePath+'/images/dingImg/grzx.png');
-
- }
-
-
-
- });
-
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/_foot.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/_foot.html
deleted file mode 100644
index 4c097f7..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/_foot.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<!-- foot开始 -->
-
-
-
- <script type="text/javascript">
-<!--
-
-//-->
- // 控制footer部分变色
-
-
-
-</script>
-
-
-
-
- <!-- foot结束 -->
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/_pageNav.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/_pageNav.html
deleted file mode 100644
index 39fe65e..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/_pageNav.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-<%
- String path = request.getContextPath();
- String basePath = request.getScheme() + "://"
- + request.getServerName() + ":" + request.getServerPort()
- + path + "/";
-%>
-
- <div class="pageNav" >
- <b>共<span class='text-primary'>${pageVo.pageCount}</span>页 当前 <span class='text-primary'>${pageVo.pageNow}</span>页</b>
- <%--上一页 --%>
- <c:choose>
- <c:when test="${pageVo.pageNow eq 1 }">
- <a class="pageNum"><上一页</a>
- </c:when>
- <c:otherwise>
- <a onclick="changePage(${pageVo.pageNow-1 })" href="javascript:void(0)" class="pageNum"><上一页</a>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${pageVo.pageCount <= 6 }">
- <c:set var="begin" value="1" />
- <c:set var="end" th:value="${pageVo.pageCount }" />
- </c:when>
- <c:otherwise>
- <c:set var="begin" th:value="${pageVo.pageNow-2 }" />
- <c:set var="end" th:value="${pageVo.pageNow + 3}" />
- <c:if test="${begin < 1 }">
- <c:set var="begin" value="1" />
- <c:set var="end" value="6" />
-
- <c:if test="${end > pageVo.pageCount }">
- <c:set var="begin" th:value="${pageVo.pageCount-5 }" />
- <c:set var="end" th:value="${pageVo.pageCount }" />
-
- </c:otherwise>
- </c:choose>
-
- <c:if test="${pageVo.pageNow >3 }">
- <a class="pageNum" onclick="changePage(1)" href="javascript:void(0)" >首页</a>
-
-
-
- <c:forEach begin="${begin }" end="${end }" var="i">
- <c:choose>
- <c:when test="${i eq pageVo.pageNow }">
- <b>${i }</b><!-- 当前页 -->
- </c:when>
- <c:otherwise>
- <a class="pageNum" onclick="changePage(${i })" href="javascript:void(0)">${i }</a>
- </c:otherwise>
- </c:choose>
- </c:forEach>
- <c:if test="${end < pageVo.pageCount }">
- <a class="pageNum" onclick="changePage(${pageVo.pageCount })" href="javascript:void(0)" >尾页</a>
-
- <%--下一页 --%>
- <c:choose>
- <c:when test="${pageVo.pageNow eq pageVo.pageCount }">
- <a class="pageNum">下san页></a>
- </c:when>
- <c:otherwise>
- <a class="pageNum" onclick="changePage(${pageVo.pageNow+1 })" href="javascript:void(0)">下san页></a>
- </c:otherwise>
- </c:choose>
-</div>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/cwqk-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/cwqk-list.html
deleted file mode 100644
index 34485d0..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/cwqk-list.html
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingPersonalAchieveReport.css}">
-<style>
- .table-box{
- width:initial;
- overflow-y: scroll;
- overflow-x: inherit;
- }
- .warptable{
- width:initial;
- overflow-y: scroll;
- overflow-x: inherit;
- }
-</style>
-</head>
-<body>
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/personal?foot=1}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 床位占用</a>
- </h1>
- <div class="am-header-right am-header-nav">
- <div class="am-dropdown" data-am-dropdown>
- <button class="am-btn am-dropdown-toggle am-btn-secondary"
- data-am-dropdown-toggle>
-
- <i class="am-header-icon am-icon-bars"></i>
- </button>
- <ul class="am-dropdown-content">
- <li class="am-active"><a
- th:href="@{/admin/occupancy/showCwzyList}">床位占用</a></li>
- <li><a th:href="@{/admin/occupancy/editMlsForm}">美疗师占用</a></li>
- </ul>
-
- </div>
- </div>
- </header>
- <!-- 头部结束 -->
-
- <div class="report ">
- <div class="am-g">
- <a href="##" class="am-u-sm-2 center" onclick="last()"><i
- class="am-icon-arrow-circle-left am-icon-fw"></i></a> <input autocomplete="off" type="date"
- class="choice-time am-u-sm-8 " id="date" th:value="${timeStr}">
- <a class="am-u-sm-2 center" onclick="next()"><i
- class="am-icon-arrow-circle-right am-icon-fw"></i></a>
- </div>
- </div>
- <div class="table-box">
-
- <table th:if="${mlsList eq null && timePark eq null}" class="box-table">
- <thead style="display: table-footer-group;">
- <tr class="am-primary">
- <th align="center">门店暂无排班情况</th>
- </tr>
- </thead>
- </table>
-
-
-
- <div class="warptable">
- <table class="box-table " id="mgridThead">
- <thead style="display: table-footer-group;">
- <tr class="am-primary">
- <th>时 间</th>
- <th th:each="item:${bedList }" ><span th:text="${item.bedName }"></span></th>
- </tr>
- </thead>
- <tbody>
-
- <tr th:each="item,counter:${timePark }" >
- <td th:text="${#dates.format(item,'HH:mm')}"
- </td >
- <td th:each="td,counter:${chart[counter.index] }" th:class="${td.css }+ ' msg'" th:msg="${td.msg}">
- <span th:if="${ td.msg ne null }" th:class="${td.css }+ ' msg'" th:msg="${td.msg}"></span>
- <span th:if="${ td.msg eq null}" th:class="${td.css } " ></span>
- </td>
- </tr>
-
- </tbody>
- </table>
- </div>
-
- </div>
- <div>
- <div class="exp-warp">
- <div class="exp-box box_success"></div>
- <div class="exp-title">可预约</div>
- </div>
- <div class="exp-warp">
- <div class="exp-box box_warning"></div>
- <div class="exp-title">已预约</div>
- </div>
- <div class="exp-warp">
- <div class="exp-box box_primary"></div>
- <div class="exp-title">服务中</div>
- </div>
- <div class="exp-warp">
- <div class="exp-box box_danger"></div>
- <div class="exp-title">服务结束</div>
- </div>
- </div>
- <script type="text/javascript">
- $(function() {
- /*修改表格宽度*/
- var o = document.getElementById("mgridThead");
- /*scrollWidth取得真实宽度,不包括滚动条,但是可以取得被隐藏的宽度*/
- var h = o.scrollWidth;
- console.log(h);
- console.log('aaa')
- $(".warptable").css('width',h);
- /*事件*/
- $(".msg").mouseenter(function(event) {
- var adNode = $("#ad");
- adNode.html($(this).attr("msg"));
- adNode.css("left", event.pageX + 10 + "px");
- adNode.css("top", event.pageY + 10 + "px");
- adNode.show();
- });
- $(".msg").mouseleave(function(event) {
- $("#ad").hide();
- });
- })
-
- function next() {
- var myDate = new Date();
- var ndate = $("#date").val();
- console.log(ndate);
- var newms = Date.parse(ndate);
- var msdate = newms + (60 * 60 * 24 * 1000);
-
- myDate.setTime(msdate);
-
- var mon = myDate.getMonth() + 1;
- var da = myDate.getDate();
- if (myDate.getMonth() + 1 < 10) {
- mon = "0" + (myDate.getMonth() + 1);
- }
- if (myDate.getDate() < 10) {
- da = "0" + myDate.getDate();
- }
- var date2 = myDate.getFullYear() + "-" + mon + "-" + da;
- $("#date").val(date2);
- var time = $("#date").val();
- if (time != '') {
- MTools
- .redirect( basePath+"/admin/occupancy/showCwzyList?timeStr="
- + time);
- }
- }
- function last() {
- var myDate = new Date();
- var ndate = $("#date").val();
- var newms = Date.parse(ndate);
- var msdate = newms - (60 * 60 * 24 * 1000);
- myDate.setTime(msdate);
- var mon = myDate.getMonth() + 1;
- var da = myDate.getDate();
- if (myDate.getMonth() + 1 < 10) {
- mon = "0" + (myDate.getMonth() + 1);
- }
- if (myDate.getDate() < 10) {
- da = "0" + myDate.getDate();
- }
- var date2 = myDate.getFullYear() + "-" + mon + "-" + da;
- $("#date").val(date2);
- var time = $("#date").val();
- if (time != '') {
- MTools
- .redirect( basePath+"/admin/occupancy/showCwzyList?timeStr="
- + time);
- }
- }
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/mls-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/mls-list.html
deleted file mode 100644
index 958e025..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/mls-list.html
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingPersonalAchieveReport.css}">
-<link rel="stylesheet" type="text/css"
- href= basePath+"/css/common-style.css">
-<style>
- .table-box{
- width:initial;
- overflow-y: scroll;
- overflow-x: inherit;
- }
- .warptable{
- width:initial;
- overflow-y: scroll;
- overflow-x: inherit;
- }
-</style>
-</head>
-<body>
- <!-- 个人业绩 -->
- <!-- 头部开始 -->
-
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/personal?foot=1}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 美疗师占用</a>
- </h1>
- <div class="am-header-right am-header-nav">
- <div class="am-dropdown" data-am-dropdown>
- <button class="am-btn am-dropdown-toggle am-btn-secondary"
- data-am-dropdown-toggle>
-
- <i class="am-header-icon am-icon-bars"></i>
- </button>
- <ul class="am-dropdown-content">
- <li><a th:href="@{/admin/occupancy/showCwzyList}">床位占用</a></li>
- <li class="am-active"><a
- th:href="@{/admin/occupancy/editMlsForm}">美疗师占用</a></li>
- </ul>
-
- </div>
- </div>
- </header>
- <!-- 头部结束 -->
- <div class="report ">
- <div class="am-g">
- <a href="##" class="am-u-sm-2 center" onclick="last()"><i
- class="am-icon-arrow-circle-left am-icon-fw"></i></a> <input autocomplete="off" type="date"
- class="choice-time am-u-sm-8 " id="date" th:value="${timeStr}">
- <a class="am-u-sm-2 center" onclick="next()"><i
- class="am-icon-arrow-circle-right am-icon-fw"></i></a>
- </div>
- </div>
-
- <div class="table-box">
- <table th:if="${mlsList eq null && timePark eq null}" class="box-table">
- <thead style="display: table-footer-group;">
- <tr class="am-primary">
- <th align="center">门店暂无排班情况</th>
- </tr>
- </thead>
- </table>
-
-
- <table th:if="${mlsList ne null && timePark ne null}" class="box-table" id="mgridThead">
- <thead>
- <tr class="am-primary">
- <th>时 间</th>
- <th th:each="item:${mlsList }" >
- <span th:text="${item.staffName }"></span>
- </th>
- </tr>
- </thead>
- </table>
- <div class="warptable">
- <table class="box-table">
- <thead style="display: table-footer-group;">
- <tr class="am-primary">
- <th>时 间</th>
- <th th:each="item:${mlsList }" >
- <span th:text="${item.staffName }"></span>
- </th>
- </tr>
- </thead>
- <tbody>
-
- <tr th:each="item,counter:${timePark }" >
- <td th:text="${#dates.format(item, 'HH:mm')}" >
- </td>
- <th:block th:each="td:${chart[counter.index] }">
- <td th:if="${td.msg ne null }" th:class="${td.css } msg" th:msg="${td.msg}"></td>
- <td th:if="${td.msg eq null}" th:class="${td.css }"></td>
- </th:block>
- </tr>
-
- </tbody>
- </table>
- </div>
-
- </div>
- <div>
- <div class="exp-warp">
- <div class="exp-box box_success"></div>
- <div class="exp-title">可预约</div>
- </div>
- <div class="exp-warp">
- <div class="exp-box box_warning"></div>
- <div class="exp-title">已预约</div>
- </div>
- <div class="exp-warp">
- <div class="exp-box box_primary"></div>
- <div class="exp-title">服务中</div>
- </div>
- <div class="exp-warp">
- <div class="exp-box box_danger"></div>
- <div class="exp-title">服务结束</div>
- </div>
- <div class="exp-warp">
- <div class="exp-box box_no"></div>
- <div class="exp-title">未上班</div>
- </div>
-
- </div>
-
-
- <div id="ad" class="adbox" style="display: none"></div>
-
-
- <script type="text/javascript">
- $(function() {
- /*修改表格宽度*/
- var o = document.getElementById("mgridThead");
- /*scrollWidth取得真实宽度,不包括滚动条,但是可以取得被隐藏的宽度*/
- var h = o.scrollWidth;
- console.log(h);
- console.log('aaa')
- $(".warptable").css('width',h);
- /*事件*/
- $(".msg").mouseenter(function(event) {
- var adNode = $("#ad");
- adNode.html($(this).attr("msg"));
- adNode.css("left", event.pageX + 10 + "px");
- adNode.css("top", event.pageY + 10 + "px");
- adNode.show();
- });
- $(".msg").mouseleave(function(event) {
- $("#ad").hide();
- });
- });
-
- function next() {
- var myDate = new Date();
- var ndate = $("#date").val();
- console.log(ndate);
- var newms = Date.parse(ndate);
- var msdate = newms + (60 * 60 * 24 * 1000);
-
- myDate.setTime(msdate);
-
- var mon = myDate.getMonth() + 1;
- var da = myDate.getDate();
- if (myDate.getMonth() + 1 < 10) {
- mon = "0" + (myDate.getMonth() + 1);
- }
- if (myDate.getDate() < 10) {
- da = "0" + myDate.getDate();
- }
- var date2 = myDate.getFullYear() + "-" + mon + "-" + da;
- $("#date").val(date2);
- var time = $("#date").val();
- if (time != '') {
- MTools.redirect( basePath+"/admin/occupancy/editMlsForm?timeStr="
- + time);
- }
- }
- function last() {
- var myDate = new Date();
- var ndate = $("#date").val();
- var newms = Date.parse(ndate);
- var msdate = newms - (60 * 60 * 24 * 1000);
- myDate.setTime(msdate);
- var mon = myDate.getMonth() + 1;
- var da = myDate.getDate();
- if (myDate.getMonth() + 1 < 10) {
- mon = "0" + (myDate.getMonth() + 1);
- }
- if (myDate.getDate() < 10) {
- da = "0" + myDate.getDate();
- }
- var date2 = myDate.getFullYear() + "-" + mon + "-" + da;
- $("#date").val(date2);
- var time = $("#date").val();
- if (time != '') {
- MTools.redirect( basePath+"/admin/occupancy/editMlsForm?timeStr="
- + time);
- }
- }
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/mobileLogin.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/mobileLogin.html
deleted file mode 100644
index 7fbcdfa..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/mobileLogin.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<html class="no-js">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
- <title>HIVE</title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingLogin.css}">
-
-</head>
-<body onkeypress="dologin(event)">
-<!-- 登陆页面-->
-<div class="wrap">
- <img th:src="@{/images/dingIcon.png}" class="login-img"></img>
- <div class="am-g">
- <div class="main am-u-sm-9 am-u-sm-centered">
- <form class="am-form am-form-horizontal dataForm ">
- <div class=" am-g">
- <input autocomplete="off" id="account" name="account"
- type="text" class="back-hui am-form-field id-in" placeholder="账号">
- </div>
-
- <div class=" am-g">
- <input autocomplete="off" id="password" name="password"
- type="password" class="back-hui am-form-field psw-in"
- placeholder="密码">
- </div>
-
- <div class=" am-g">
- <input autocomplete="off" id="reId" type="checkbox" checked="" name="">
- 记住密码
- </div>
-
-
- <!--登陆按钮-->
- <div class="am-form-group am-g">
-
- <button type="button" onclick="login()"
- class="am-btn am-btn-default am-u-sm-12 back-hui">登      入
- </button>
-
- </div>
- <input autocomplete="off" type="hidden" name="isDing" value="1"/>
- </form>
- </div>
- </div>
-</div>
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
-
-<script th:src="@{/js/function/MCookies.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script type="text/javascript" th:src="@{/js/plugin/jsencrypt.min.js}"></script>
-
-
-<!-- index js -->
-<script type="text/javascript" th:inline="javascript">
-
- var crypt = new JSEncrypt();
-
- /*<![CDATA[*/
-
- var publicKey =/*[[${session.publicKey}]]*/
-
- /*]]>*/
-
- crypt.setKey(publicKey);
-
-
- //登陆
-
- function login() {
- if ($("#account").val() == "") {
- layer
- .open({
- content: '请输入账号！',
- className: 'showBox',
- time: 2
- });
- return false;
- } else if ($("#password").val() == "") {
- layer
- .open({
- content: '请输入密码！',
- className: 'showBox',
- time: 2
- });
- return false;
- }
-
-
- var encAcc = crypt.encrypt($("#account").val());
- var encPwd = crypt.encrypt($("#password").val());
- $.AjaxProxy({
- p: {
- suAccount: encAcc,
- suPassword: encPwd
- }
- }).invoke("/common/doHiveMobilelogin", function (loj) {
- if ($('#reId').is(':checked')) {
- // do something
- MCookies.add("account",$("#account").val());
- MCookies.add("password",$("#password").val());
- }else{
- MCookies.del("account");
- MCookies.del("password");
- }
- MTools.redirect("/" + loj.getValue("page"));
- });
-
- }
-
-
- $(function () {
- if (MCookies.isExist("account")) {
- $("#reId").attr("checked", 'true');
- $("#account").val(MCookies.get("account"));
- $("#password").val(MCookies.get("password"));
- }
- })
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-car.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-car.html
deleted file mode 100644
index 6e2ddd7..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-car.html
+++ /dev/null
@@ -1,308 +0,0 @@
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingPersonalCar.css}" >
-
-</head>
-<style>
- .foot-c {
- background: #999
- }
-
- .am-navbar .am-navbar-nav {
- padding-left: 0;
- }
-
- .am-header-right a {
- color: #fff;
- }
-</style>
-<script th:if="${session.CURRENT_CUSTOMER eq null}">
-
- MTools.redirect(basePath + "/admin/redirect/hive/mobile/order-search");
-
-</script>
-<body>
-<!-- 购物车页面 -->
-<!-- 头部开始 -->
-<header data-am-widget="header" class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order?foot=4}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 我的购物车 </a>
- </h1>
-
- <div class="am-header-right am-header-nav">
- <a id="clearCar"> 清空 </a>
- </div>
-</header>
-<!-- 头部结束 -->
-
-
-<!-- 购物车表单开始 -->
-<div class="main main1" id="carItemsBox">
- <div class="empty-car" th:if="${session.SHOPPING_CAR} eq null or ${#lists.size(session.SHOPPING_CAR)} eq 0">
- <p id="empty-car">购物车空空的~</p>
- <p>
- <a th:href="@{/admin/redirect/hive/mobile/order-list}"> 马上去选购! </a>
- </p>
- </div>
- <form th:if="${session.SHOPPING_CAR} ne null and ${#lists.size(session.SHOPPING_CAR)} ne 0" class="am-form am-form-horizontal" action=""
- id="dataform"
- onsubmit="javascripr:return false;">
- <!-- <input class="am-form-field am-input-sm" type="text" placeholder="">
- <br/> -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
-
- <div class="am-list-news-bd">
- <ul class="am-list">
- <!--缩略图在标题右边-->
- <!-- 如果是商品 -->
- <li th:each="item,flag:${session.SHOPPING_CAR}"
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-right">
- <div class=" am-u-sm-2 am-list-thumb am-checkbox">
- <label class="am-checkbox">
- <input type="checkbox" onclick="caculateMoney()" th:isF="${item.isFree}"
- th:name="'carItems['+${flag.index}+'].id'"
- th:value="${item.id}" class="check" data-am-ucheck>
-
- </label>
- <!-- 增加隐藏域名 -->
-
-
- <input type="hidden" th:name="'carItems['+${flag.index}+'].type'" th:value="${item.type}">
- <input type="hidden" th:name="'carItems['+${flag.index}+'].isFree'"
- th:value="${item.isFree }">
- <input type="hidden" th:name="'carItems['+${flag.index}+'].goodsId'"
- th:value="${item.goodsId}">
- </div>
-
- <div class=" am-u-sm-10 am-list-main am-list-item-thumb-left">
-
- <h3 class="am-list-item-hd">
- <span th:text="${item.shoppingGoods.name }"> </span>
- <br/>
- <span>价格<strong class="color-r" th:text="${item.shoppingGoods.sealPice }"></strong></span>
- <span th:if="${item.isFree eq '是'}">【赠】 </span>
- </h3>
- <div class="am-list-item-text">
- <div class="am-input-group am-input-group-primary">
- <a class="am-input-group-label reduce">
- <i class="am-header-icon am-icon-minus"></i>
- </a>
- <input th:name="'carItems['+${flag.index}+'].count'" type="tel"
- id="num" class="am-form-field " th:value="${item.count }"/>
- <a class="am-input-group-label add">
- <i class="am-header-icon am-icon-plus"></i>
- </a>
- </div>
- </div>
-
- </div>
- </li>
-
- <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-right">
- <div class=" am-u-sm-2 am-list-thumb am-checkbox">
- <label class="am-checkbox">
- <input type="checkbox" onclick="sellectAll(this)" class="check" data-am-ucheck>
- </label>
- </div>
- <div class=" am-u-sm-10 am-list-main am-list-item-thumb-left">
- <h3 class="am-list-item-hd"> <span>全选</span><br/> </h3>
- </div>
- </li>
- </ul>
- </div>
- <div>
-
-
-
- </div>
-
-
- <div class="ps">
- <textarea name="remark" class=" border " clos="100"
- rows="2" warp="virtual" placeholder="备注信息"></textarea>
- </div>
-
-
- <div data-am-widget="navbar" class="am-navbar am-cf am-navbar-default back-m1" id="">
- <ul class="am-navbar-nav am-cf am-avg-sm-3 back-m1">
- <li class="foot-c">
- <a href="" class="">
- <span class="">共<span id="goodsNum">0</span>件商品</span>
- </a>
- </li>
- <li class="foot-c ">
- <a href="###" class="">
-
- <span class="">合计:¥<strong id="orderTotalMoney">0</strong></span>
-
- </a>
- </li>
- <li class="back-m1">
- <a href="###" onclick="myForm.submit()">
- <span class="">下单</span>
-
- </a>
- </li>
-
- </ul>
- </div>
-
-
- </div>
-
- </form>
-
-
-
-
-
-</div>
-
-
-<!-- 购物车表单结束 -->
-<!-- 弹出 -->
-<div class="am-modal am-modal-confirm" tabindex="-1" id="my-confirm">
- <div class="am-modal-dialog">
- <div class="am-modal-hd">提示</div>
- <div class="am-modal-bd">你确定要清空购物车吗？</div>
- <div class="am-modal-footer">
- <span class="am-modal-btn" data-am-modal-cancel>取消</span> <span
- class="am-modal-btn" data-am-modal-confirm>确定</span>
- </div>
- </div>
-</div>
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
- $(function () {
- $(".select2").select2({'width': '100%'});
- MTools.autoFullSelect();
- //数量
- $(".add").bind("click", function () {
- if ($(this).prev().val() >= 0) {
- $(this).prev().val(parseInt($(this).prev().val()) + 1);
- }
- caculateMoney();
- });
- $(".reduce").bind("click", function () {
- if ($(this).next().val() > 1) {
- $(this).next().val(parseInt($(this).next().val()) - 1);
- }
- caculateMoney();
- });
- });
-
- function sellectAll(node) {
- //
- var checked=node.checked;
- $(".am-ucheck-checkbox").each(function(){
- this.checked=checked;
- });
- caculateMoney();
-
- }
- //下单
- var myForm = MForm.initForm({
- invokeUrl: basePath + "/admin/order/addOrder",
- isvalid: false,
- afterSubmit: function (loj) {
- var msg = '';
- if (loj.attr("result").status == '200') {
- msg = '下单成功';
- layer.open({
- shade: false,
- content: msg,
- className: 'showBox',
- time: 1,
- end: function (elem) {
- MTools.redirect(basePath + "/admin/redirect/hive/mobile/order?foot=4");
- }
- });
- }
- }
- });
-
- /* 弹出JS */
- $(function () {
- $('#clearCar').on('click', function () {
- $('#my-confirm').modal({
- relatedTarget: this,
- onConfirm: function (options) {
- //请求服务器清空session
- $.AjaxProxy().invoke(
- basePath + "/admin/shoppingCar/clearShoppingCar",
- function (loj) {
- location.reload();
- })
- },
- });
- //清空列表
- });
- });
-
- function caculateMoney() {
- // 找到所有被选中的元素
- var money = 0.00;
- var goodsNum = 0;
- $("input:checked").each(function (i) {
- var _this = $(this);
- var freeFlag = _this.attr("isF");
- if (freeFlag == '否') {
- m = parseFloat(_this.parent().parent().next('div').find('strong').html());
- n = parseInt(_this.parent().parent().next('div').find('#num').val());
- money += m * n;
- goodsNum += n;
- }
- });
- console.log(money);
- $("#orderTotalMoney").html(money);
- $("#goodsNum").html($("input:checked").length);
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-history-msg.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-history-msg.html
deleted file mode 100644
index 5a66a8f..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-history-msg.html
+++ /dev/null
@@ -1,280 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <!-- Tile icon for Win8 (144x144 + tile color) -->
-
-
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-
-</head>
-<style>
- .msg {
- padding-left: 0;
- }
-</style>
-<body>
-<!-- 会员注册页面 -->
-<!-- 头部开始 -->
-
-<header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
-
- <a onclick="window.history.go(-1)" > <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
-
-
-
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 订单详情 </a>
- </h1>
-
-</header>
-<!-- 头部结束 -->
-
-
-<!-- 会员注册表单开始 -->
-<div class=" main2">
- <form class="am-form am-form-horizontal " method="post"
- id="dataform" onsubmit="javascripr:return false;">
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">订单编号</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label " th:text="${order.orderNo }"></span>
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">订单日期</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label " th:text=" ${#dates.format(order.orderTime,'yyyy-MM-dd')}"> </span>
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">订单总价</span>
- </div>
-
- <div class="am-u-sm-8">
- <strong class="am-input-group-label color-r" th:text="'￥'+${order.zkTotal }"></strong>
-
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
- <div th:if="${order.statu ne '待付款'}">
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">现金付款</span>
- </div>
-
- <div class="am-u-sm-8">
- <strong class="am-input-group-label color-r" th:text="'￥'+${order.cashPay }"></strong>
-
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">卡付款</span>
- </div>
-
- <div class="am-u-sm-8">
- <strong class="am-input-group-label color-r" th:text="'￥'+${order.cardPay }"></strong>
-
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
- </div>
-
- <div th:if="${order.statu eq '欠款'}">
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">欠款</span>
- </div>
-
- <div class="am-u-sm-8">
- <strong class="am-input-group-label color-r" th:text="'￥'+${order.arrears }"></strong>
-
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">购买人</span>
- </div>
-
- <div class="am-u-sm-8">
- <span class="am-input-group-label " th:text="${order.vipName }"></span>
-
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">备注</span>
- </div>
-
- <div class="am-u-sm-8">
- <span class="am-input-group-label " th:text="${order.remark }"></span>
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label color-gray">订单状态</span>
- </div>
-
- <div class="am-u-sm-8">
- <span class="am-input-group-label " th:text="${order.statu }"></span>
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-12 ">
- <h2 class="msghead color-gray">订单明细</h2>
- </div>
- </div>
- <div th:if="${order.items!= null}">
- <div th:each="item:${order.items }">
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
-
-
- <div class="am-u-sm-6">
- <span class="msg" th:text="${item.shoppingGoods.name }"></span>
- </div>
- <div class="am-u-sm-6">
- <span class="msg color-r" th:text="'￥'+${item.zkPrice * item.count }"></span>
- </div>
- <div class="am-u-sm-6">
- <span class=" msg" th:text="'数量:'+${item.count }"></span>
- </div>
- <div class="am-u-sm-6">
- <span class=" msg" th:text="${item.shoppingGoods.name }"></span>
- </div>
- <div class="am-u-sm-12 ">
- <div class="line"></div>
- </div>
- </div>
-
-
- </div>
- </div>
-
- <div th:if="${order.items eq null}"
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">暂无商品详情</span>
- </div>
- </div>
-
- <div th:if="${order.statu eq '待付款' }" class="inputBtn">
- <button class="am-btn am-btn-danger am-radius am-btn-block"
- type="button" onclick="cancelOrder()">取消订单
- </button>
- </div>
- <input type="hidden" id="orderId" th:value="${order.id}">
- </form>
-</div>
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
- function cancelOrder() {
- $
- .AjaxProxy({p: {id: $("#orderId").val()}})
- .invoke(
- basePath + "/admin/order/cancelOrder",
- function (loj) {
- if (loj.status = '200') {
- layer
- .open({
- content: "订单已取消",
- className: 'shouBox',
- time: 2,
- end: function (elem) {
- MTools
- .redirect(basePath + "/admin/redirect/hive/mobile/order-dfk");
- }
- });
-
- }
- })
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-history.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-history.html
deleted file mode 100644
index c8ffea0..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-history.html
+++ /dev/null
@@ -1,194 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-
-</head>
-<body >
-
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order?foot=4}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 订单 </a>
- </h1>
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1">
- <form class="am-form am-form-horizontal" id="dataform" onsubmit="javascripr:return false;">
-
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
-
- <div id="orderSelect" class="am-u-sm-4">
- <select name="statu" id="statu" >
- <option value=''>订单状态</option>
- <option value='欠款'>欠款</option>
- <option value='待付款'>待付款</option>
- <option value='已付款'>已付款</option>
- <option value='已取消'>已取消</option>
- <option value='退款'>退款</option>
- </select>
- </div>
- <div class="am-u-sm-5 search">
- <input autocomplete="off" type="text" class="searchIn" name="keyWordVo" placeholder="姓名/编号/手机号码" />
- <!-- <label>开始时间：</label>
- <input autocomplete="off" type="date" name="beginTimeVo" id="beginTime"/>
- <label>结束时间：</label>
- <input autocomplete="off" type="date" name="endTimeVo" id="endTime"/> -->
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" name="limit" value="10" />
- </div>
- <div class="am-u-sm-3 btn">
- <button type="button" class="am-btn am-btn-default am-radius searchBtn" onclick="Pagination.serchDate()">搜索</button>
- </div>
-
- </div>
-
- <!-- 订单表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g" id="ur_title">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">订单号 </h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr ">购买人 </h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">时间 </h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr ">总价</h2>
-
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">操作 </h2>
- </div>
- </div>
-
- <div class="am-list-news-bd">
- <ul class="am-list" id="showdataBox"></ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px">
- </div>
-
- </div>
-
-
- <!-- 商品展示结束 -->
- <!-- 测试 -->
-
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script type="text/javascript">
- /*
- *加载订单信息
- */
- $(function(){
- Pagination.init({
- url : basePath+"/admin/order/showStaffOrder",
- builderDate:function(loj){
- var html="";
- if(loj.getRowCount()>0){
- $("#pagingBox").show();
- $("#ur_title").show();
- //构建数据
- for(var i=0; i<loj.getRowCount(); i++){
- html += "<li class='am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left'><div class='am-u-sm-3 '><h3 class='am-list-item-hd'>"
- +loj.getString(i,'orderNo')
- +"</h3></div><div class='am-u-sm-2 '><h3 class='am-list-item-hd'>"
- +loj.getString(i,'vipName')
- +"</h3></div><div class='am-u-sm-3 '><h3 class='am-list-item-hd'>"
- +loj.getDate(i,'orderTime')
- +"</h3></div><div class='am-u-sm-2 color-r'><h3 class='am-list-item-hd'><strong>"
- +loj.getString(i,'total')
- +"</strong></h3></div><div class='am-u-sm-2 '>"
- +"<a class='am-list-item-hd' href='"+basePath+"/admin/order/findOrderDetailById?id="+loj.getString(i,'id')+"'>详情</a></div></li>";
- }
- return html;
- }else{
- $("#pagingBox").hide();
- $("#ur_title").hide();
-
- }
-
-
- }
- }).serchDate();
-
- //开始时间小于结束时间
- $("#beginTime").change(function(){
- var beginTime = $("#beginTime").val();
- if(beginTime!=""){
- $("#endTime").attr("min",beginTime);
- }
- });
-
- });
-
-
-
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-list.html
deleted file mode 100644
index 135fb76..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-list.html
+++ /dev/null
@@ -1,281 +0,0 @@
-
-
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-<style type="text/css">
-.box-2{
-width: 50px;
- text-align: center;
- position: fixed;
- bottom: 30px;
- right: 5px;
- z-index: 999999;
- background: #fff;
-
-}
-.dot{
- width: 14px;
- height: 14px;
- border-radius: 7px;
- background: red;
- display: inline-block;
- font-size: 5px;
- color: #fff;
- line-height: 15px;
- position: relative;
- top: 15px;
- left: 15px;}
-</style>
-</head>
-<script th:if="${session.CURRENT_CUSTOMER eq null}">
-
- MTools.redirect(basePath + "/admin/redirect/hive/mobile/order-search");
-
-</script>
-
-
-<body >
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order?foot=4}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 商品列表 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1">
- <form class="am-form am-form-horizontal" id="dataform" onsubmit="javascripr:return false;">
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div id="orderSelect" class="am-u-sm-4">
- <select name=type id="order-select">
- <option value="家居产品">商品</option>
- <option value="项目">项目</option>
- <option value="套餐">套餐</option>
- <option value="充值卡">充值卡</option>
- <option value="综合卡">综合卡</option>
- </select>
- </div>
- <div class="am-u-sm-5 search">
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" id="limit" name="limit" value="10" />
- <input autocomplete="off" type="text" class="searchIn" placeholder="产品名称" name="keyword" />
- </div>
- <div class="am-u-sm-3 btn">
- <button class="am-btn am-btn-default am-radius searchBtn" onclick="Pagination.serchDate()">搜索</button>
- </div>
- </div>
- <div id="main" style="display: none">
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-5 ">
- <h2 class="am-list-news-more am-fr">商品名</h2>
- </div>
- <div class="am-u-sm-4 " id="isgoods">
- <h2 class="am-list-news-more am-fr">价格</h2>
-
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">操作 </h2>
- </div>
- </div>
- <div class="am-list-news-bd" >
- <ul class="am-list" id="showdataBox">
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px">
- </div>
- </div>
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </div>
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
- <div class="box box-2">
- <span class="dot" id="dot" th:if="${session.SHOPPING_CAR ne null}" th:text="${#lists.size(session.SHOPPING_CAR)}"></span>
- <span class="dot" id="dot" th:if="${session.SHOPPING_CAR eq null}" >0</span>
-
- <a th:href="@{/admin/redirect/hive/mobile/order-car}">
- <img width="50px" th:src= "@{/images/dingImg/gwc.png}"><br>
- </a></div>
-
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
- var $dot=$("#dot");
-
- function addCar(_id,_type,_assembleId){
- var param={
- isFree:'否',
- type:_type,
- goodsId:_id,
- count:1,
- assembleId:_assembleId
- }
-
- $.AjaxProxy({p:param}).invoke( basePath+"/admin/shoppingCar/addItemToCar",function(){
- msg='成功加入购物车';
- layer.open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 1,
- });
- var count=$dot.html();
- if(!count){
- count=0
- }
- count=parseInt(count)+1;
- $dot.html(count);
-
- });
- }
- //获取详情
- var getOrderDetialPath=["order-msg","order-msg2","order-msg3","order-msg4","order-msg5"];
-
-
- /**
- 加载数据
- **/
- $(function(){
- var pageSize=$("#limit").val();
- var flag = $.query.get("flag");
- if(flag){
- $("#order-select").val(flag);
- }
- Pagination.init({
- url: basePath+"/admin/shoppinggoods/showGoodsList",
- pageSize : pageSize,
- builderDate:function(loj){
- var initType=$("#order-select").val();
- if(loj.getRowCount()>0){
- $("#main").show();
- //构建数据
- var html="";
- var name;
- var price;
- var priceFlag='￥';
- var pageType=0;
- var car='<i style="font-size:12px; line-height: 25px; width:25px; height:25px;" class="am-icon-btn am-success am-icon-cart-plus am-success am-icon-sm " ></i> ';
- if(initType=='家居产品'){
- pageType=1;
- }
- else if(initType=='项目'){
- pageType=2;
- }
- else if(initType=='套餐'){
- pageType=3;
- }else if(initType=='充值卡'){
- pageType=4;
- }else if(initType=='综合卡'){
- pageType=5;
- }
- for(var i=0 ; i<loj.getRowCount(); i++ ){
- html +='<li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">'
- +'<div class="am-u-sm-5 ">';
- console.log(initType);
- if(initType=='家居产品'){
- html +='<h3 onclick="addCar('+loj.getString(i,'id')+',\''+initType+'\','+''+')" class="am-list-item-hd">'+car+loj.getString(i,"name")+'</h3>'
- }
- else if(initType=='项目'){
- //var assembleId=loj.getString(i,"assembleProj")[0].id;
- //console.log(assembleId);
- html +='<h3 onclick="addCar('+loj.getString(i,'id')+',\''+initType+'\','+''+')" class="am-list-item-hd">'+car+loj.getString(i,"name")+'</h3>';
- }
- else{ html +='<h3 onclick="addCar('+loj.getString(i,'id')+',\''+initType+'\')" class="am-list-item-hd">'+car+loj.getString(i,"name")+'</h3>';
- }
- var sealPice=loj.getString(i,"sealPice");
- if(!sealPice){sealPice=0}
-
- html+='</div>'
- +'<div class="am-u-sm-4 ">'
- +' <h3 class="am-list-item-hd color-r">'+priceFlag+sealPice+'</h3>'
- +'</div>'
- +'<div class="am-u-sm-3 ">'
- +'<a href="'+getOrderDetialPath[pageType-1]+'?ding_order_id='+loj.getString(i,"id")+'">详情</a>'
- +'</div>'
- +'</li>';
- }
- return html;
- }else{
- $("#main").hide();
- $("#pagingBox").hide();
-
- }
- }
- }).serchDate();
- })
-
- //fn2 下拉列表，添加change事件
- $("#order-select").change(function(){
- $("#_offset").val(0)
- Pagination.serchDate();
- });
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg.html
deleted file mode 100644
index acfa11f..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderMsg3.css}">
-
-</head>
-<style>
-</style>
-<body>
-<!-- 商品详情页面 -->
-<!-- 头部开始 -->
-<header data-am-widget="header" class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order-list?flag=家居产品}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 商品详情 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="###" class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
-</header>
-<!-- 头部结束 -->
-<form class="am-form am-form-horizontal " action="" id="dataform"
- onsubmit="javascripr:return false;">
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default all">
- <div class="goods-img">
- <img id="shopImg">
- </div>
-
- <div class="am-list-news-bd">
-
- <ul class="am-list">
- <li class="am-g am-list-item-dated"><a href="##"
- class="am-list-item-hd "> 商品名称</a> <strong
- class="am-list-date color-black" id="name"></strong></li>
- <li class="am-g am-list-item-dated"><a href="##"
- class="am-list-item-hd "> 商品销量</a> <strong
- class="am-list-date color-r" id="sealCount"></strong></li>
- <li class="am-g am-list-item-dated"><a href="##"
- class="am-list-item-hd "> 商品价格</a> <strong
- class="am-list-date color-r" id="price"></strong></li>
- <!-- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 绑定数量</a>
- <strong class="am-list-date color-black" id="total"></strong>
- </li> -->
- <li class="am-g am-list-item-dated"><a href="##"
- class="am-list-item-hd "> 商品介绍</a> <span
- class="am-list-date"
- id="introduction"></span></li>
- <li class="am-g ">
-
- <div class=" am-u-sm-12 guige ">
- <!-- 数量选择 -->
- <div
- class="am-input-group am-form-group am-input-group-primary ">
- <span class="am-input-group-label num">项目数量</span> <a
- onclick="num(1)" class="am-input-group-label"> <i
- class="am-header-icon am-icon-minus"></i>
- </a> <input autocomplete="off" type="tel" id="num" class="am-form-field "
- readonly="readonly" value="1" name="count"/> <a
- onclick="num(2)" class=" am-input-group-label"> <i
- class="am-header-icon am-icon-plus"></i>
- </a>
- </div>
- </div>
-
- </li>
-
- <li class="am-g ">
- <div class="am-u-sm-4 guige">
- <span class="am-list-item-hd color-gray"> 详细描述</span>
- </div>
- </li>
- <li class="am-g ">
-
- <div class=" am-u-sm-12 guige ">
- <p id="description" class="color-gray"></p>
- </div>
-
- </li>
-
-
- </ul>
- </div>
-
-
- <!-- 测试 -->
- <!-- 增加隐藏域 -->
- <input type="hidden" name="goodsId" id="goodsId">
- <input type="hidden" name="assembleId" id="assembleId">
- <input type="hidden" name="type" value="家居产品" id="type">
- </div>
- <div class="inputBtn am-g">
- <div class="am-u-sm-4" id="isPresent" style="display: none">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="mysubmit('是')">赠送
- </button>
-
- </div>
-
- <div class="am-u-sm-4 ">
- <button class="am-btn btn-m1 am-btn-block" type="button"
- onclick="mysubmit('否')">加入购物车
- </button>
- </div>
-
- </div>
-</form>
-<!-- 客户到访表单结束 -->
-
-
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
- //数量
- function num(obj) {
- if (obj == 1) {
- if ($("#num").val() > 1) {
- $("#num").val($("#num").val() - 1);
- }
-
- }
- if (obj == 2) {
- if ($("#num").val() >= 0) {
- $("#num").val(parseInt($("#num").val()) + 1);
- }
- }
- }
-
- // 弹出页面层
-
- function showBox() {
- var myForm = MForm.initForm({
- invokeUrl: basePath + "/admin/shoppingCar/addItemToCar",
- isvalid: false
-
- });
- }
-
- $(function () {
- var ding_order_id = $.query.get('ding_order_id');
- $.AjaxProxy({
- p: {
- id: ding_order_id
- },
- a: true,
- c: true,
- })
- .invoke(
- basePath + "/admin/shoppinggoods/findShoppingGoods",
- function (loj) {
-
- $("#name").html(loj.getString(0, "name"));
- $("#sealCount").html(
- loj.getString(0, "sealCount"));
- $("#introduction").html(
- loj.getString(0, "introduction"));
- $("#price").html(
- '￥' + loj.getString(0, "sealPice"));
- $("#goodsId").val(loj.getString(0, "id"));
- $("#shopImg").attr("src",
- loj.getString(0, "img"));
- $("#description").html(
- loj.getString(0, "description"));
- var isPresent = loj.getString(0, "isPresent");
- if (isPresent == '是') {
- $("#isPresent").show();
- }
-
- });
- })
-
- function changePrice() {
-
- }
-
- function mysubmit(isFree) {
- var myForm = MForm
- .initForm({
- invokeUrl: basePath + "/admin/shoppingCar/addItemToCar",
- isvalid: false,
- extendParam: {
- isFree: isFree
- },
- beforeSubmit: function () {
-
- },
- afterSubmit: function (loj) {
- var msg = '';
- if (loj.attr("result").status == '200') {
- msg = '操作成功';
- layer
- .open({
- shade: false,
- content: msg,
- className: 'showBox',
- time: 1,
- end: function (elem) {
- MTools
- .redirect(basePath + "/admin/redirect/hive/mobile/order-list?flag=家居产品");
- }
- });
- }
- }
- });
- myForm.submit();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg2.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg2.html
deleted file mode 100644
index 8ebc6de..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg2.html
+++ /dev/null
@@ -1,264 +0,0 @@
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
-
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingOrderMsg3.css}">
-
-</head>
-<body>
- <!-- 项目详情页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order-list?flag=项目}" class="">
-
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">
- 项目详情
- </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="###" class="">
-
- <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
- <form class="am-form am-form-horizontal" action="" id="dataform" onsubmit="javascripr:return false;">
- <div data-am-widget="list_news" class="am-list-news am-list-news-default all" >
- <div class="goods-img"><img id="shopImg" ></div>
- <div class="am-list-news-bd">
- <ul class="am-list">
-
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 项目名称</a>
-
- <strong class="am-list-date color-black"id="projName"></strong>
-
-
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 项目价格</a>
-
- <strong class="am-list-date color-r"id="projPrice"></strong>
-
-
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 销量</a>
-
- <strong class="am-list-date color-r"id="sealCount"></strong>
-
-
- </li>
-
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 项目编号</a>
-
- <span class="am-list-date" id="projNo"></span>
-
-
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 项目服务时长</a>
-
- <span class="am-list-date color-y" id="timeLength"></span>
-
- </li>
- <li class="am-g ">
-
- <div class=" am-u-sm-12 guige ">
- <!-- 数量选择 -->
- <div
- class="am-input-group am-form-group am-input-group-primary ">
- <span class="am-input-group-label num">项目数量</span> <a
- onclick="num(1)" class="am-input-group-label"> <i
- class="am-header-icon am-icon-minus"></i>
- </a> <input autocomplete="off" type="tel" id="num" class="am-form-field "
- readonly="readonly" value="1" name="count" /> <a
- onclick="num(2)" class=" am-input-group-label"> <i
- class="am-header-icon am-icon-plus"></i>
- </a>
- </div>
- </div>
- </li>
-
- <!-- 详细描述 -->
- <li class="am-g ">
- <div class="am-u-sm-4 guige">
- <span class="am-list-item-hd color-gray"> 详细描述</span>
- </div>
- </li>
- <li class="am-g ">
-
- <div class=" am-u-sm-12 guige " >
- <p id="description" class="color-gray"></p>
- </div>
-
- </li>
- <!-- 详细描述结束 -->
- </ul>
- </div>
-
-
-
-
-
-
-
- <!-- 测试 -->
- <!-- 增加隐藏域 -->
- <input autocomplete="off" type="hidden" name="goodsId" id="goodsId">
- <input autocomplete="off" type="hidden" name="type" value="项目" id="type">
- </div>
- <div class="inputBtn am-g">
- <div class="am-u-sm-4" id="isPresent" style="display:none">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="mysubmit('是')">赠送</button>
-
- </div>
-
- <div class="am-u-sm-4 ">
- <button class="am-btn btn-m1 am-btn-block"
- type="button" onclick="mysubmit('否')">加入购物车</button>
- </div>
-
- </div>
- </form>
-
- <!-- 客户到访表单结束 -->
-
-
-
-
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
-//数量
- function num(obj){
- if(obj==1){
- if($("#num").val()>1){
- $("#num").val($("#num").val()-1);
- }
-
- }
- if(obj==2){
- if($("#num").val()>=0){
- $("#num").val(parseInt($("#num").val())+1);
- }
- }
- }
-
- // 弹出页面层
-
- function showBox() {
- layer.open({
- type: 0,
- content: '操作成功',
- style: 'position:fixed; left:10%; top:25%; width:80%; height:30%; border-radius:5%;'
- });
-}
-
- //項目详情页面
- $(function(){
- var ding_order_id=$.query.get('ding_order_id');
- $.AjaxProxy({
- p : {
- id:ding_order_id
- },
- a : true,
- c : true,
- }).invoke( basePath+"/admin/shoppinggoods/findShoppingGoods", function(loj){
-
- // 获取组合中包含的项目信息
- $("#projName").html(loj.getString(0,"name")==''?' ':loj.getString(0,"name"));
- $("#projPrice").html('￥'+loj.getString(0,"sealPice"));
- $("#sealCount").html(loj.getString(0,"sealCount"));
- $("#projNo").html(loj.getString(0,"code"));
- $("#timeLength").html(loj.getString(0,"timeLength")+" 分钟");
- $("#goodsId").val(loj.getString(0,"id"));
- $("#shopImg").attr("src",loj.getString(0, "img"));
- $("#description").html(loj.getString(0, "description"));
- //商品类型为项目时候，只有一个项目，因此直接去下表为0的项目
- var isPresent=loj.getString(0, "isPresent");
- if(isPresent=='是'){
- $("#isPresent").show();
- }
-
- });
- })
- //加入购物车和赠送
- function mysubmit(isFree){
- var myForm=MForm.initForm({
- invokeUrl: basePath+"/admin/shoppingCar/addItemToCar",
- isvalid:false,
- extendParam:{isFree:isFree},
- afterSubmit:function(loj){
- var msg='';
- if(loj.attr("result").status=='200'){
- msg='操作成功';
- layer.open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 1,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/hive/mobile/order-list?flag=项目");
- }
- });
- }
- else{
- msg='操作失败';
- layer.open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 2
- });
- }
- }
- });
- myForm.submit();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg3.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg3.html
deleted file mode 100644
index 2e12c06..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg3.html
+++ /dev/null
@@ -1,289 +0,0 @@
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <!-- Tile icon for Win8 (144x144 + tile color) -->
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingOrderMsg3.css}">
-
-</head>
-<body>
-<!-- 套餐详情页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order-list?flag=套餐}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class="">
- 套餐详情
- </a>
- </h1>
- </header>
- <!-- 头部结束 -->
- <form class="am-form am-form-horizontal" action="" id="dataform" onsubmit="javascripr:return false;">
- <div class=" main1 all" >
- <div data-am-widget="list_news" class="am-list-news am-list-news-default" >
-
- <div class="goods-img"><img src="" id="shopImg" ></div>
- <div class="am-list-news-bd">
- <ul class="am-list">
-
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 套餐名称</a>
- <span class="am-list-date color-black" id="taocanName"></span>
- </li>
-
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 套餐价格</a>
- <span class="am-list-date color-r" id="sale"></span>
- </li>
-
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 销量</a>
- <span class="am-list-date color-r" id="sealCount"></span>
- </li>
-
-
- <li class="am-g am-list-item-dated">
- <a class="am-list-item-hd "> 有效期限</a>
- <span class="am-list-date" id="validity"></span>
- </li>
- <li class="am-g am-list-item-dated"></li>
- </ul>
- </div>
-
-
- <!-- 数量选择 -->
- <div class="am-input-group am-form-group am-input-group-primary">
- <span class="am-input-group-label num">套餐数量</span>
- <a onclick="num(1)" class="am-input-group-label">
- <i class="am-header-icon am-icon-minus"></i>
- </a>
- <input autocomplete="off" type="tel" id="num"class="am-form-field " readonly="readonly" value="1" name="count">
- <a onclick="num(2)" class=" am-input-group-label">
- <i class="am-header-icon am-icon-plus"></i>
- </a>
- </div>
- <!-- 项目详情 -->
- <div class="am-panel am-panel-secondary" id="vipLevel">
- <div class="am-panel-hd">
- <h2 class="am-panel-title" >项目详情</h2>
- <span class="down down1" ></span>
- </div>
- <div class="vipMsg">
- <ul class="am-list am-list-static am-list-border" id="projDetails">
- </ul>
- </div>
- </div>
- <!-- 项目详情结束 -->
- <!-- 商品详情开始 -->
- <div class="am-panel am-panel-secondary" id="vipLevel2">
- <div class="am-panel-hd">
- <h2 class="am-panel-title" >商品详情</h2>
- <span class="down down2" ></span>
- </div>
- <div class="vipMsg2">
- <ul class="am-list am-list-static am-list-border" id="goodsDetails">
- </ul>
-
- </div>
- </div>
- <!-- 商品详情结束 -->
-
- <ul class="am-list">
- <li class="am-g ">
- <div class="am-u-sm-4 guige">
- <span class="am-list-item-hd color-gray"> 详细描述</span>
- </div>
- <div class=" am-u-sm-7 guige " >
- <p id="description" class="color-gray"></p>
- </div>
-
- </li>
- </ul>
-
-
-
- <!-- 测试 -->
- <!-- 增加隐藏域 -->
- <input autocomplete="off" type="hidden" name="goodsId" id="goodsId">
- <input autocomplete="off" type="hidden" name="type" value="套餐" id="type">
- <input autocomplete="off" type="hidden" id="hidval" value="0">
- <input autocomplete="off" type="hidden" id="hidval2" value="0">
- </div>
- </div>
- <div class="inputBtn am-g">
- <div class="am-u-sm-4" id="isPresent" style="display:none">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="mysubmit('是')">赠送</button>
-
- </div>
-
- <div class="am-u-sm-4 ">
- <button class="am-btn btn-m1 am-btn-block"
- type="button" onclick="mysubmit('否')">加入购物车</button>
- </div>
-
-</div>
-</form>
- <!-- 客户到访表单结束 -->
-
-
-
-
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
-
- // 数量增加减少js
- function num(obj){
- if(obj==1){
- if($("#num").val()>1){
- $("#num").val($("#num").val()-1);
- }
-
- }
- if(obj==2){
- if($("#num").val()>=0){
- $("#num").val(parseInt($("#num").val())+1);
- }
- }
- }
- // 商品项目详情js
- $(function () {
- $("#vipLevel").bind("click", function () {
- if ($("#hidval").val() == 1) {
- $(".down1").css("transform","rotate(0deg)");
- $(".vipMsg").slideUp(500,function(){
- $("#hidval").val(0);
-
- })
- } else {
- $(".down1").css("transform","rotate(180deg)");
- $(".vipMsg").slideDown(500,function(){
- $("#hidval").val(1);
- })
- }
- })
- });
- $(function () {
- $("#vipLevel2").bind("click", function () {
- if ($("#hidval2").val() == 1) {
- $(".down2").css("transform","rotate(0deg)");
- $(".vipMsg2").slideUp(500,function(){
- $("#hidval2").val(0);
-
- })
- } else {
- $(".down2").css("transform","rotate(180deg)");
- $(".vipMsg2").slideDown(500,function(){
- $("#hidval2").val(1);
-
- })
- }
- });
-
- });
-
-
-
- //套餐详情页面
- $(function(){
- var ding_order_id=$.query.get('ding_order_id');
- $.AjaxProxy({
- p : {
- id:ding_order_id
- },
- a : true,
- c : true,
- }).invoke( basePath+"/admin/shoppinggoods/findShoppingGoods", function(loj) {
-
- //销售套餐的基本信息
- $("#taocanName").html(loj.getString(0,"name")==''?' ':loj.getString(0,"name"));
- $("#sale").html('￥'+(loj.getString(0,"sealPice")==''?' ':loj.getString(0,"sealPice")));
- $("#sealCount").html(loj.getString(0,"sealCount")==''?' ':loj.getString(0,"sealCount"));
- $("#validity").html(loj.getString(0,"validity")==''?' ':loj.getString(0,"validity")+" 月");
- $("#goodsId").val(loj.getString(0,"id"));
- $("#shopImg").attr("src",loj.getString(0, "img"));
- $("#description").html(loj.getString(0, "description"));
- var isPresent=loj.getString(0, "isPresent");
- if(isPresent=='是'){
- $("#isPresent").show();
- }
-
- });
- })
- //赠送和加入购物车
- function mysubmit(isFree){
- var myForm=MForm.initForm({
- invokeUrl: basePath+"/admin/shoppingCar/addItemToCar",
- isvalid:false,
- extendParam:{isFree:isFree},
- afterSubmit:function(loj){
- var msg='';
- if(loj.attr("result").status=='200'){
- msg='操作成功';
- layer
- .open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 1,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/hive/mobile/order-list?flag=套餐");
- }
- });
- }
- else{
- msg='操作失败';
- layer
- .open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 2
- });
- }
- }
- });
- myForm.submit();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg4.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg4.html
deleted file mode 100644
index 17b9cb9..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg4.html
+++ /dev/null
@@ -1,245 +0,0 @@
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <!-- Tile icon for Win8 (144x144 + tile color) -->
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingOrderMsg3.css}">
-
-</head>
-<body>
-<!-- 套餐详情页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order-list?flag=充值卡}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class="">
- 充值卡详情
- </a>
- </h1>
- </header>
- <!-- 头部结束 -->
- <form class="am-form am-form-horizontal" action="" id="dataform" onsubmit="javascripr:return false;">
- <div class=" main1 all" >
- <div data-am-widget="list_news" class="am-list-news am-list-news-default" >
-
- <div class="goods-img"><img src="" id="shopImg" ></div>
- <div class="am-list-news-bd">
- <ul class="am-list">
-
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 卡名</a>
- <span class="am-list-date color-black" id="taocanName"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 价格</a>
- <span class="am-list-date color-r" id="sale"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 赠送金额</a>
- <span class="am-list-date " id="referencePice"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 可消费总金额</a>
- <span class="am-list-date color-r" id="totalMoney"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 会籍卡</a>
- <span class="am-list-date " id="isVipCar"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 使用次数</a>
- <span class="am-list-date " id="carUseCount"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 最大发卡次数</a>
- <span class="am-list-date " id="carMaxSaleCount"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a class="am-list-item-hd "> 有效期限</a>
- <span class="am-list-date" id="validity"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 销量</a>
- <span class="am-list-date color-r" id="sealCount"></span>
- </li>
-
- <li class="am-g am-list-item-dated"></li>
- </ul>
- </div>
-
-
- <!-- 数量选择 -->
- <div class="am-input-group am-form-group am-input-group-primary">
- <span class="am-input-group-label num">套餐数量</span>
- <a onclick="num(1)" class="am-input-group-label">
- <i class="am-header-icon am-icon-minus"></i>
- </a>
- <input autocomplete="off" type="tel" id="num"class="am-form-field " readonly="readonly" value="1" name="count">
- <a onclick="num(2)" class=" am-input-group-label">
- <i class="am-header-icon am-icon-plus"></i>
- </a>
- </div>
-
- <ul class="am-list">
- <li class="am-g ">
- <div class="am-u-sm-4 guige">
- <span class="am-list-item-hd color-gray"> 详细描述</span>
- </div>
- <div class=" am-u-sm-7 guige " >
- <p id="description" class="color-gray"></p>
- </div>
-
- </li>
- </ul>
- <!-- 增加隐藏域 -->
- <input autocomplete="off" type="hidden" name="goodsId" id="goodsId">
- <input autocomplete="off" type="hidden" name="type" value="充值卡" id="type">
- </div>
- </div>
- <div class="inputBtn am-g">
- <div class="am-u-sm-4" id="isPresent" style="display:none">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="mysubmit('是')">赠送</button>
-
- </div>
-
- <div class="am-u-sm-4 ">
- <button class="am-btn btn-m1 am-btn-block"
- type="button" onclick="mysubmit('否')">加入购物车</button>
- </div>
-
-</div>
-</form>
-
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
-
- // 数量增加减少js
- function num(obj){
- if(obj==1){
- if($("#num").val()>1){
- $("#num").val($("#num").val()-1);
- }
-
- }
- if(obj==2){
- if($("#num").val()>=0){
- $("#num").val(parseInt($("#num").val())+1);
- }
- }
- }
-
-
-
-
- //套餐详情页面
- $(function(){
- var ding_order_id=$.query.get('ding_order_id');
- $.AjaxProxy({
- p : {
- id:ding_order_id
- },
- a : true,
- c : true,
- }).invoke( basePath+"/admin/shoppinggoods/findShoppingGoods", function(loj) {
-
- //销售套餐的基本信息
- $("#taocanName").html(loj.getString(0,"name")==''?' ':loj.getString(0,"name"));
- $("#sale").html('￥'+(loj.getString(0,"sealPice")==''?' ':loj.getString(0,"sealPice")));
- $("#sealCount").html('￥'+loj.getString(0,"sealCount")==''?' ':loj.getString(0,"sealCount"));
- $("#referencePice").html(loj.getString(0,"referencePice"));
- $("#validity").html(loj.getString(0,"validity")==''?' ':loj.getString(0,"validity")+" 月");
- $("#goodsId").val(loj.getString(0,"id"));
- $("#shopImg").attr("src",loj.getString(0, "img"));
- $("#isVipCar").html(loj.getString(0, "isVipCar"));
- $("#description").html(loj.getString(0, "description"));
- var sealPice =loj.getString(0, "sealPice") == '' ? 0 : loj.getString(0, "sealPice");
- var referencePice = loj.getString(0, "referencePice") == '' ? 0 :loj.getString(0, "referencePice");
- var totalMoney = parseFloat(sealPice) + parseFloat(referencePice);
- $("#totalMoney").html('￥'+totalMoney);
- $("#carMaxSaleCount").html(loj.getString(0, "carMaxSaleCount")==0?'无限制':loj.getString(0, "carMaxSaleCount"));
- $("#carUseCount").html(loj.getString(0, "carUseCount")==0?'无限制':loj.getString(0, "carUseCount"));
- var isPresent=loj.getString(0, "isPresent");
- if(isPresent=='是'){
- $("#isPresent").show();
- }
-
- });
- })
- //赠送和加入购物车
- function mysubmit(isFree){
- var myForm=MForm.initForm({
- invokeUrl: basePath+"/admin/shoppingCar/addItemToCar",
- isvalid:false,
- extendParam:{isFree:isFree},
- afterSubmit:function(loj){
- var msg='';
- if(loj.attr("result").status=='200'){
- msg='操作成功';
- layer
- .open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 1,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/hive/mobile/order-list?flag=充值卡");
- }
- });
- }
- else{
- msg='操作失败';
- layer
- .open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 2
- });
- }
- }
- });
- myForm.submit();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg5.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg5.html
deleted file mode 100644
index 88e91b3..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg5.html
+++ /dev/null
@@ -1,269 +0,0 @@
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <!-- Tile icon for Win8 (144x144 + tile color) -->
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingOrderMsg3.css}">
-
-</head>
-<body>
-<!-- 套餐详情页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order-list?flag=综合卡}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class="">
- 综合卡详情
- </a>
- </h1>
- </header>
- <!-- 头部结束 -->
- <form class="am-form am-form-horizontal" action="" id="dataform" onsubmit="javascripr:return false;">
- <div class=" main1 all" >
- <div data-am-widget="list_news" class="am-list-news am-list-news-default" >
-
- <div class="goods-img"><img src="" id="shopImg" ></div>
- <div class="am-list-news-bd">
- <ul class="am-list">
-
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 卡名</a>
- <span class="am-list-date color-black" id="taocanName"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 价格</a>
- <span class="am-list-date color-r" id="sale"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 赠送金额</a>
- <span class="am-list-date " id="referencePice"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 可消费总金额</a>
- <span class="am-list-date color-r" id="totalMoney"></span>
- </li>
-
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 使用次数</a>
- <span class="am-list-date " id="carUseCount"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 最大发卡次数</a>
- <span class="am-list-date " id="carMaxSaleCount"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a class="am-list-item-hd "> 有效期限</a>
- <span class="am-list-date" id="validity"></span>
- </li>
- <li class="am-g am-list-item-dated">
- <a href="##" class="am-list-item-hd "> 销量</a>
- <span class="am-list-date color-r" id="sealCount"></span>
- </li>
-
- <li class="am-g am-list-item-dated"></li>
- </ul>
- </div>
-
-
- <!-- 数量选择 -->
- <div class="am-input-group am-form-group am-input-group-primary">
- <span class="am-input-group-label num">数量</span>
- <a onclick="num(1)" class="am-input-group-label">
- <i class="am-header-icon am-icon-minus"></i>
- </a>
- <input autocomplete="off" type="tel" id="num"class="am-form-field " readonly="readonly" value="1" name="count">
- <a onclick="num(2)" class=" am-input-group-label">
- <i class="am-header-icon am-icon-plus"></i>
- </a>
- </div>
- <!-- 项目详情 -->
- <div class="am-panel am-panel-secondary" id="vipLevel">
- <div class="am-panel-hd">
- <h2 class="am-panel-title" >综合卡详情</h2>
- <span class="down down1" ></span>
- </div>
- <div class="vipMsg">
- <ul class="am-list am-list-static am-list-border" id="projDetails">
- </ul>
- </div>
- </div>
-
-
- <ul class="am-list">
- <li class="am-g ">
- <div class="am-u-sm-4 guige">
- <span class="am-list-item-hd color-gray"> 详细描述</span>
- </div>
- <div class=" am-u-sm-7 guige " >
- <p id="description" class="color-gray"></p>
- </div>
-
- </li>
- </ul>
- <!-- 增加隐藏域 -->
- <input autocomplete="off" type="hidden" name="goodsId" id="goodsId">
- <input autocomplete="off" type="hidden" name="type" value="综合卡" id="type">
- </div>
- </div>
- <div class="inputBtn am-g">
- <div class="am-u-sm-4" id="isPresent" style="display:none">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="mysubmit('是')">赠送</button>
-
- </div>
-
- <div class="am-u-sm-4 ">
- <button class="am-btn btn-m1 am-btn-block"
- type="button" onclick="mysubmit('否')">加入购物车</button>
- </div>
-
-</div>
-</form>
- <input autocomplete="off" type="hidden" id="hidval" value="0">
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
-
-$("#vipLevel").bind("click", function () {
-console.log($("#hidval").val());
- if ($("#hidval").val() == 1) {
- $(".down1").css("transform","rotate(0deg)");
- $(".vipMsg").slideUp(500,function(){
- $("#hidval").val(0);
-
- })
- } else {
- $(".down1").css("transform","rotate(180deg)");
- $(".vipMsg").slideDown(500,function(){
- $("#hidval").val(1);
- })
- }
-})
-
- // 数量增加减少js
- function num(obj){
- if(obj==1){
- if($("#num").val()>1){
- $("#num").val($("#num").val()-1);
- }
-
- }
- if(obj==2){
- if($("#num").val()>=0){
- $("#num").val(parseInt($("#num").val())+1);
- }
- }
- }
-
-
-
-
- //套餐详情页面
- $(function(){
- var ding_order_id=$.query.get('ding_order_id');
- $.AjaxProxy({
- p : {
- id:ding_order_id
- },
- a : true,
- c : true,
- }).invoke( basePath+"/admin/shoppinggoods/findShoppingGoods", function(loj) {
-
- //销售套餐的基本信息
- $("#taocanName").html(loj.getString(0,"name")==''?' ':loj.getString(0,"name"));
- $("#sale").html('￥'+(loj.getString(0,"sealPice")==''?' ':loj.getString(0,"sealPice")));
- $("#sealCount").html('￥'+loj.getString(0,"sealCount")==''?' ':loj.getString(0,"sealCount"));
- $("#referencePice").html(loj.getString(0,"referencePice"));
- $("#validity").html(loj.getString(0,"validity")==''?' ':loj.getString(0,"validity")+" 月");
- $("#goodsId").val(loj.getString(0,"id"));
- $("#shopImg").attr("src",loj.getString(0, "img"));
- $("#description").html(loj.getString(0, "description"));
- var sealPice =loj.getString(0, "sealPice") == '' ? 0 : loj.getString(0, "sealPice");
- var referencePice = loj.getString(0, "referencePice") == '' ? 0 :loj.getString(0, "referencePice");
- var totalMoney = parseFloat(sealPice) + parseFloat(referencePice);
- $("#totalMoney").html('￥'+totalMoney);
- $("#carMaxSaleCount").html(loj.getString(0, "carMaxSaleCount")==0?'无限制':loj.getString(0, "carMaxSaleCount"));
- $("#carUseCount").html(loj.getString(0, "carUseCount")==0?'无限制':loj.getString(0, "carUseCount"));
- var isPresent=loj.getString(0, "isPresent");
- if(isPresent=='是'){
- $("#isPresent").show();
- }
-
- });
- })
- //赠送和加入购物车
- function mysubmit(isFree){
- var myForm=MForm.initForm({
- invokeUrl: basePath+"/admin/shoppingCar/addItemToCar",
- isvalid:false,
- extendParam:{isFree:isFree},
- afterSubmit:function(loj){
- var msg='';
- if(loj.attr("result").status=='200'){
- msg='操作成功';
- layer
- .open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 1,
- end: function(elem){
- MTools.redirect( basePath+"/admin/redirect/hive/mobile/order-list?flag=综合卡");
- }
- });
- }
- else{
- msg='操作失败';
- layer
- .open({
- shade:false,
- content :msg,
- className : 'showBox',
- time : 2
- });
- }
- }
- });
- myForm.submit();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-search.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-search.html
deleted file mode 100644
index cfc9102..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-search.html
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href= "@{/css/dingOrderSearch.css}">
-<style type="text/css">
-#userList {
- height: 200px;
- overflow: scroll;
- overflow-x: hidden;
-}
-</style>
-</head>
-<body onkeypress="dosearch(event)">
- <header data-am-widget="header"
- class="am-header color-w back-m1 back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order?foot=4}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 会员搜索 </a>
- </h1>
- </header>
- <!-- 商品搜索页面 -->
- <div class="wrap">
- <div class="am-g">
- <div class="am-u-sm-9 no-right">
- <input autocomplete="off" id="userName" name="acctNo" type="text"
- class="am-form-field id-in am-dropdown-up" placeholder="请输入手机号或者姓名" />
- <ul id="userList" class="userList " style="display: none">
- </ul>
-
- </div>
- <div class="am-u-sm-3 no-left">
- <button class="am-btn am-btn-default" type="button"
- onclick="searchUser()">
- <span class="am-icon-search"></span>
- </button>
- </div>
- </div>
- </div>
-
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script>
- $(function() {
-
- $("#userName").bind('input propertychange', function() {
- console.log(1);
- var $input = $("#userName");
- if ($input.length < 1) {
- return false;
- }
-
- if ($input.val().length > 1) {
- $
- .AjaxProxy({
- p : {
- keyWord : $input.val(),
- },
- c : false,
- })
- .invoke(
- basePath+"/admin/vipInfo/findUserByPhoto",
- function(loj) {
- var html = "";
- if (loj.getRowCount() > 0) {
- for (var i = 0; i < loj
- .getRowCount(); i++) {
- html += '<li onclick="selectList(\''
- + loj
- .getString(
- i,
- 'phone')
- + '\')" >'
- + loj
- .getString(
- i,
- 'phone')
- + "-"
- + loj
- .getString(
- i,
- 'vipName')
- + "-"
- + loj
- .getString(
- i,
- 'vipNo')
- + '</li>';
- }
- $("#userList")
- .html(html)
- .show();
- } else {
- $("#userList")
- .empty()
- .hide();
- }
-
- });
- } else {
- $("#userList").hide();
- }
- });
- })
-
- function searchUser() {
- if ($("#userName").val().length < 1) {
- layer.open({
- shade : false,
- content : "请输入关键词后再查询",
- className : 'showBox',
- time : 1,
- });
- return false;
- }
-
- $
- .AjaxProxy({
- p : {
- keyWord : $("#userName").val(),
- },
- c : false,
- })
- .invoke(
- basePath+"/admin/vipInfo/showVipInfo",
- function(loj) {
- if (loj.getRowCount() > 0) {
- layer
- .open({
- shade : false,
- content : "查找成功",
- className : 'showBox',
- time : 1,
- end : function(elem) {
- MTools
- .redirect( basePath+"/admin/redirect/hive/mobile/order?foot=4");
- }
- });
-
- } else {
- layer.open({
- shade : false,
- content : "未查询到此会员",
- className : 'showBox',
- time : 2
- });
- }
- });
- }
- function dosearch(e) {
- if (e.keyCode == 13) {
- e.preventDefault();
- window.event.returnValue = false;
- searchUser();
- return false;
- }
- }
-
- function selectList(phone) {
- $("#userList").hide();
- $("#userName").val(phone);
- searchUser();
- }
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-service.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-service.html
deleted file mode 100644
index 56c22fc..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-service.html
+++ /dev/null
@@ -1,289 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="description" content="">
- <meta name="keywords" content="">
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <title th:text="${session.userInfo.shopName }"></title>
-
-
-
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" href= basePath+"/css/dingOrderService.css">
-
-</head>
-<body>
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order?foot=4}" class="">
-
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">
- 服务列表
- </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a class="">
-
- <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
- <div data-am-widget="tabs"
- class="am-tabs am-tabs-d2"
- >
- <ul class="am-tabs-nav am-cf">
- <li class="am-active"><a href="[data-tab-panel-0]">完成服务单</a></li>
- <li class=""><a href="[data-tab-panel-1]">未完成服务单</a></li>
-
- </ul>
- <div class="am-tabs-bd">
- <div data-tab-panel-0 class="am-tab-panel am-active">
- <div class="main main1">
- <form class="am-form am-form-horizontal" action="">
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-1">
- <span> </span>
- </div>
- <div class="am-u-sm-7 search">
- <input autocomplete="off" type="search" class="searchIn" />
- </div>
- <div class="am-u-sm-3 btn">
- <button class="am-btn am-btn-default am-radius searchBtn" >搜索</button>
- </div>
- <div class="am-u-sm-1">
- <span> </span>
- </div>
-
- </div>
-
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">编号</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">总价</h2>
-
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">时间 </h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">购买人 </h2>
- </div>
-
- </div>
-
- <div class="am-list-news-bd">
- <ul class="am-list">
- <li
- class="am-g ">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">110</h3>
- </div>
-
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2000</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2014-02-02</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">周杰伦</h3>
- </div>
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">110</h3>
- </div>
-
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2000</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2014-02-02</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">小外</h3>
- </div>
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">110</h3>
- </div>
-
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2000</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2014-02-02</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">小外</h3>
- </div>
- </li>
- </ul>
- </div>
-
- </div>
-
-
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- </div>
- <div data-tab-panel-1 class="am-tab-panel ">
- <div class="main main1">
- <form class="am-form am-form-horizontal" action="">
-
- <div
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-1">
- <span> </span>
- </div>
- <div class="am-u-sm-7 search">
- <input autocomplete="off" type="search" class="searchIn" />
- </div>
- <div class="am-u-sm-3 btn">
- <button class="am-btn am-btn-default am-radius searchBtn" >搜索</button>
- </div>
- <div class="am-u-sm-1">
- <span> </span>
- </div>
-
- </div>
-
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">编号</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">总价</h2>
-
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">时间 </h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">购买人 </h2>
- </div>
-
- </div>
-
- <div class="am-list-news-bd">
- <ul class="am-list">
- <li
- class="am-g ">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">110</h3>
- </div>
-
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2000</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2014-02-02</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">陈奕迅</h3>
- </div>
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">110</h3>
- </div>
-
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2000</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2014-02-02</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">小外</h3>
- </div>
- </li>
- <li
- class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">110</h3>
- </div>
-
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2000</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">2014-02-02</h3>
- </div>
- <div class="am-u-sm-3 ">
- <h3 class="am-list-item-hd">小外</h3>
- </div>
- </li>
- </ul>
- </div>
-
- </div>
-
-
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- </div>
-
- </div>
- </div>
-
-
-
-
-
-
-
- </div>
-
-
-
-
-
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-completed.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-completed.html
deleted file mode 100644
index d1053e2..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-completed.html
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-
-</head>
-<script>
-
-</script>
-
-
-<body >
- <!-- 已完成列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 服务单 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
-
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1">
- <form class="am-form am-form-horizontal" id="dataform" onsubmit="javascripr:return false;">
- <div id="serach" style="display: none"
- class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div id="orderSelect" class="am-u-sm-4">
- <select name="state" id="state" >
- <option value=''>服务单状态</option>
- <option value="待预约">待预约</option>
- <option value="预约成功待处理">预约成功待处理</option>
- <option value="预约失败">预约失败</option>
- <option value="预约取消">预约取消</option>
- <option value="需配料">需配料</option>
- <option value="配料完成">配料完成</option>
- <option value="服务中">服务中</option>
- <option value="服务完成">服务完成</option>
- <option value="服务单结束">服务单结束</option>
- </select>
- </div>
- <div class="am-u-sm-5 search">
- <input autocomplete="off" type="text" class="searchIn" name="vipName" placeholder="用户姓名"/>
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" name="limit" value="10" />
- </div>
- <div class="am-u-sm-3 btn">
- <button type="button" class="am-btn am-btn-default am-radius searchBtn" onclick="Pagination.serchDate()">搜索</button>
- </div>
- </div>
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news" id="context" style="display: none;"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <div class="am-u-sm-4 ">
- <h2 class="am-list-news-more am-fr">编号</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">客户姓名</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">状态</h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">操作</h2>
- </div>
- </div>
- <div class="am-list-news-bd">
- <ul class="am-list" id="showdataBox">
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px">
- </div>
- </div>
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
- <script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
- /**
- 加载数据
- **/
- $(function(){
- Pagination.init({
- url: basePath+"/admin/projService/getStaffServiceOrder",
- builderDate:function(loj){
- var html="";
- //构建数据
- if(loj.getRowCount()>0){
- $("#serach").show();
- $("#context").show();
-
-
-
- for(var i=0 ; i<loj.getRowCount(); i++ ){
- var option='';
- var id=loj.getString(i,"id");
- if(loj.getString(i,"state")=='配料完成'){
- option='<a class="am-list-item-hd" onclick="startService('+id+')" >开始服务</a>';
- }else if(loj.getString(i,"state")=='服务中'){
- option='<a class="am-list-item-hd" onclick="endService('+id+')" >结束服务</a>';
- }
-
- html+=' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left"> <div class="am-u-sm-4 "> <h3 class="am-list-item-hd">'
- +loj.getString(i,"serviceNo")+
- '</h3> </div> <div class="am-u-sm-3 "><h3 class="am-list-item-hd">'
- +loj.getString(i,"vipInfo.vipName")+
- '</h3> </div> <div class="am-u-sm-3 "> <h3 class="am-list-item-hd">'
- +loj.getString(i,"state")+
- '</h3> </div><div class="am-u-sm-2 ">'
- +'<a class="am-list-item-hd" href="'+basePath+'/admin/projService/serviceInfo?id='+loj.getString(i,"id")+'&page=mobile" >详情</a> | ' +option+ '</div></li>'
- }
- //显示数据
- //$("#showdataBox").html(html);
- return html;
- }else{
- $("#pagingBox").hide();
-
- }
- }
- }).serchDate();
- })
-
- function endService(id) {
-
- var url = basePath + "/admin/projService/endService?id=" + id;
- $
- .AjaxProxy()
- .invoke(
- url,
- function (loj) {
- console.log(loj);
- if (loj.status = '200') {
- layer
- .open({
- content: "服务结束~",
- className: 'shouBox',
- time: 2,
- end: function (elem) {
- Pagination.serchDate();
- }
- });
-
- }
- })
- }
-
- function startService(id) {
- var url = basePath + "/admin/projService/startService?id=" + id;
- $
- .AjaxProxy()
- .invoke(
- url,
- function (loj) {
- console.log(loj);
- if (loj.status = '200') {
- layer
- .open({
- content: "服务开始~",
- className: 'shouBox',
- time: 2,
- end: function (elem) {
- Pagination.serchDate();
- }
- });
- }
- })
- }
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-end-service.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-end-service.html
deleted file mode 100644
index 8804a15..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-end-service.html
+++ /dev/null
@@ -1,303 +0,0 @@
-
-
-
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- href= basePath+"/css/dingOrderUseNew.css">
-<link rel="stylesheet" type="text/css"
- th:href="@{/plugin/LCalendar/src/css/LCalendar.css">
-
-</head>
-<script>
-
-</script>
-<body>
- <!-- 待预约详情页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order-use-inservice" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">服务单</a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
-
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="main main2">
- <input autocomplete="off" type="hidden" id="serviceId" name="id"
- value="${projServices.id }" />
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务编号</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.serviceNo }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">客户姓名</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.vipName }"></span>
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">下单顾问</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.createStaffName }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">创建时间</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label"
- th:text="${#dates.format(projServices.createTime,'yyyy-MM-dd HH:mm')}"
- > </span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">配料师</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.plsName }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">美疗师</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:each="item:${projServices.beauticianStates }">
- <span th:if="${projServices.beauticianId eq item.beautiStaffInfo.suId}" th:text="'【主：'+${item.beautiStaffInfo.suName }+'】'" ></span>
- <span th:if="${projServices.beauticianId ne item.beautiStaffInfo.suId}" th:text="'【'+${item.beautiStaffInfo.suName }+'】'"></span>
- <br>
- </span>
- </div>
- </div>
-
-
- <c:if test="">
- <div th:if="${not empty projServices.projUses}" th:each="item:${projServices.projUses }">
- <hr>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">项目名称</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.name }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">剩余次数</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.surplusCount }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务时长</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.projInfo.timeLength }"></span>
- </div>
- </div>
-
- </div>
-
- <hr>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">预约时间</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${#dates.format(projServices.yyTime,'yyyy-MM-dd HH:mm')}" >
- </span>
- </div>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务开始时间</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${#dates.format(projServices.startTime,'yyyy-MM-dd HH:mm')}">
- </span>
- </div>
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务预计时长</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${projServices.totalTime }">
- 分钟 </span>
- </div>
- </div>
- </div>
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">预约床位</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${projServices.bedName }">
- </span>
- </div>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">备注</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.remark }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">皮肤状况</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.skinCond }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">其他信息</span>
- </div>
-
- </div>
- <div class="Validform_checktip"></div>
-
-
- <div th:if=" " class="inputBtn">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="toResult()">结束服务</button>
- </div>
-
- </div>
- </form>
-
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/LCalendar/src/js/LCalendar.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- function toResult() {
- var id = $("#serviceId").val();
- var url = basePath+"/admin/projService/endService?id=" + id;
- $
- .AjaxProxy()
- .invoke(
- url,
- function(loj) {
- console.log(loj);
- if (loj.status = '200') {
- layer
- .open({
- content : "服务结束~",
- className : 'shouBox',
- time : 2,
- end : function(elem) {
- MTools
- .redirect( basePath+"/admin/redirect/hive/mobile/order-use-inservice");
- }
- });
-
- }
- })
- }
- </script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-look-endService.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-look-endService.html
deleted file mode 100644
index 003014f..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-look-endService.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <!-- Tile icon for Win8 (144x144 + tile color) -->
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/plugin/LCalendar/src/css/LCalendar.css}">
-
-</head>
-<script>
-
-</script>
-<body>
-<!-- 待预约详情页面 -->
-<!-- 头部开始 -->
-<!-- 头部开始 -->
-<header data-am-widget="header" class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a onclick="javascript:history.back(-1)" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">服务单</a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
-
- </div> -->
-</header>
-<!-- 头部结束 -->
-<div th:if="${obj== null}">
- <p id="empty-car">查询失败</p>
-</div>
-<div class="main3">
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <!-- <div class="main main1"> -->
- <input autocomplete="off" type="hidden" id="serviceId" name="id"
- th:value="${obj.id }"/>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务编号</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.serviceNo }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">客户姓名</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.vipInfo.vipName }"></span>
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">下单顾问</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.createStaffName }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">创建时间</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label"
- th:text="${#dates.format(obj.createTime,'yyyy-MM-dd HH:mm')}"
- > </span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">配料师</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.plsName }"></span>
- </div>
- </div>
-
- <div th:each="item:${obj.serviceItems }">
- <hr>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">项目名称</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.projInfo.name }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">美疗师</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.beautiStaffInfo?.suName }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">剩余次数</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.projUse.surplusCount }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务时长</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.projInfo.timeLength }"></span>
- </div>
- </div>
-
- </div>
-
- <hr>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">预约时间</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${#dates.format(obj.yyTime,'yyyy-MM-dd HH:mm')}" >
- </span>
- </div>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务开始时间</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${#dates.format(obj.startTime,'yyyy-MM-dd HH:mm')}">
- </span>
- </div>
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务预计时长</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${obj?.totalTime }">
- 分钟 </span>
- </div>
- </div>
- </div>
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">预约床位</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${obj?.bedName }">
- </span>
- </div>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">备注</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.remark }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">皮肤状况</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${obj?.skinCond }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">其他信息</span>
- </div>
-
- </div>
-
- <div th:if="${obj.state eq '配料完成'}" class="inputBtn">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="startService()">开始服务
- </button>
- </div>
- <div th:if="${obj.state eq '服务中' }" class="inputBtn">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="endService()">结束服务
- </button>
- </div>
- </form>
-</div>
-
-<script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<script th:src="@{/plugin/LCalendar/src/js/LCalendar.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
- function endService() {
- var id = $("#serviceId").val();
- var url = basePath + "/admin/projService/endService?id=" + id;
- $
- .AjaxProxy()
- .invoke(
- url,
- function (loj) {
- console.log(loj);
- if (loj.status = '200') {
- layer
- .open({
- content: "服务结束~",
- className: 'shouBox',
- time: 2,
- end: function (elem) {
- history.back(-1);
- }
- });
-
- }
- })
- }
-
- function startService() {
- var id = $("#serviceId").val();
- var url = basePath + "/admin/projService/startService?id=" + id;
- $
- .AjaxProxy()
- .invoke(
- url,
- function (loj) {
- console.log(loj);
- if (loj.status = '200') {
- layer
- .open({
- content: "服务开始~",
- className: 'shouBox',
- time: 2,
- end: function (elem) {
- history.back(-1);
- }
- });
-
- }
- })
- }
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-new.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-new.html
deleted file mode 100644
index 0ce22aa..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-new.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <!-- Tile icon for Win8 (144x144 + tile color) -->
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderUseNew.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/plugin/LCalendar/src/css/LCalendar.css}">
- <style>
- .am-form .input-num[type=number] {
- padding: 0;
- text-align: center;
- border: 1px solid #eee
- }
- </style>
-</head>
-<script th:if="${session.CURRENT_CUSTOMER eq null}">
-
- MTools.redirect(basePath + "/admin/redirect/hive/mobile/order-search");
-
-</script>
-
-<body>
-<!-- 购物车页面 -->
-<!-- 头部开始 -->
-<header data-am-widget="header" class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a onclick="javascript:history.back(-1)" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 新建服务 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="###" class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
-</header>
-<!-- 头部结束 -->
-
-<!-- 购物车表单开始 -->
-<form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <input type="hidden" th:value="${session.CURRENT_CUSTOMER?.id }" name="vipId" />
- <div class="main main1">
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <h3 style="text-align: center;" id="tite">可消耗的项目</h3>
- <div class="am-list-news-bd">
- <ul class="am-list" id="ul_order_use">
-
- </ul>
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g" id="ps">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">备注</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <textarea rows="3" name="remark"></textarea>
- </div>
- </div>
- </div>
- <div id="submitBtn">
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">预约时间</span>
- </div>
- <div class="am-u-sm-8">
- <!-- <div>
- <input id="demo1" style="display: none" type="text" readonly=""
- placeholder="日期选择特效" />
- </div> -->
- <div>
- <input id="time" name="yyTime" type="text" readonly=""
- placeholder="请选择时间" dataType="*" nullmsg="请选择时间" data-lcalendar="2016-05-11,2016-05-11"/>
- </div>
- </div>
- </div>
- <input type="hidden" id="projIds" name="projIds"/>
-
- <div class="Validform_checktip"></div>
- <div class="inputBtn">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="myForm.submit()">新建服务
- </button>
- </div>
-
- </div>
- </div>
-
-</form>
-
-<!-- 购物车表单结束 -->
-<script type="text/javascript">
-
- /* $("#time").attr("data-lcalendar",date2+","+date3); */
-
-</script>
-
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<script th:src="@{/plugin/LCalendar/src/js/LCalendar.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
- /* $('.datetimepicker').datetimepicker({
- format : "yyyy-mm-dd hh:ii",
- autoclose: true,
- }); */
-
-
- $(function () {
- /* 计算当前时间 */
-
-
- MTools.autoFullSelect();
-
- $
- .AjaxProxy()
- .invoke(
- basePath + "/admin/projService/getUserProjInfo",
- function (loj) {
- var html = "";
- var taoCanList = loj.attr("result")["mapInfo"].taoCanList;
-
- var projList=loj.attr("result")["mapInfo"].projList;
-
- if (projList.length > 0 || taoCanList.length > 0) {
-
- var flag = -1; //用来设置不同name的值
- //循环取出套餐的信息
-
- for (var i = 0; i < taoCanList.length; i++) {
- var taocanInfo = taoCanList[i];
- html += '<li class="lic am-g " >'
- + '<div class=" am-u-sm-9 am-list-main"><h3 class="am-list-item-hd">'
- + taocanInfo.projName
- + '</h3></div><div class=" am-list-main"><h3 class="am-list-item-hd color-r"> <strong>余次'
- + taocanInfo.surplusCount
- + '</strong></h3></li>';
-
- //循环取出一个套餐中包含的项目
- for (var j = 0; j < taocanInfo.taocanProjUse.length; j++) {
- flag += 1;
- var projUse = taocanInfo.taocanProjUse[j];
-
- html += '<li class="lic am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left " >'
- + '<div class=" am-u-sm-1 am-list-thumb ">'
- + '<label class=" am-checkbox ">'
- + '<input id="box' + flag + '" type="checkbox" name="projBox" class="check" value='
- + projUse.id
- + '></label></div>'
- + '<div class=" am-u-sm-5 am-list-main"><h3 class="am-list-item-hd">'
- + projUse.projName
- + '</h3></div><div class=" am-u-sm-2 am-list-main"><h3 class="am-list-item-hd color-y">'
- + projUse.projInfo.timeLength
- + ' 分钟</h3></div><div class="am-u-sm-2 am-list-thumb color-num"> <span>'
- + projUse.surplusCount
- + '</span></div>'
- + '<div class="am-u-sm-2 am-list-thumb color-num">'
- + '<input class="input-num" id="inputbox' + flag + '" placeholder="次数" value="1" type="number" max="8" min="1"/>'
- + '</div>'
- + '</li>';
- }
- html += '<div class="taocan"></div>'
- + '</div>';
- }
-
- if (projList.length > 0) {
- //循环取出项目列表
- for (var i = 0; i < projList.length; i++) {
- var projUse=projList[i];
- flag += 1;
- html += ' <li class=" lic am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left " >'
- + '<div class=" am-u-sm-1 am-list-thumb "><label class=" am-checkbox ">'
- + '<input id="box' + flag + '" type="checkbox" name="projBox" class="check " value='
- + projUse.id
- + '></label></div>'
- + '<div class=" am-u-sm-5 am-list-main"><h3 class="am-list-item-hd">'
- + projUse.projName
- + '</h3></div><div class="am-u-sm-2 am-list-thumb color-num"> <span>余'
- + projUse.surplusCount
- + '次</span></div>'
- + '<div class="am-u-sm-2 am-list-thumb color-num">'
- + '<input class="input-num" type="number" id="inputbox' + flag + '" value="1" max="8" min="1"/>'
- + '</div></li><div class="taocan"></div>';
- }
- }
-
-
- } else {
- $("#ps").remove();
- $("#tite").remove();
- html = '<p style="text-align:center">没有可消耗的项目！</p>'
- + '<p style="text-align:center"><a href="' + basePath + '/admin/redirect/hive/mobile/order-list"> 马上去选购! </a></p>'
- $("#submitBtn").hide();
- }
- //显示数据
- $("#ul_order_use").html(html);
- //初始化表单
- myForm = MForm
- .initForm({
- invokeUrl: basePath + "/admin/projService/addServiceForForm",
-
- beforeSubmit: function () {
-
- var projIds = "";
-
- var param = this.extendParam;
-
- $('input:checkbox[name=projBox]:checked').each(function (i) {
- var num = $("#input" + $(this).attr("id")).val();
- var puseId = $(this).val();
- param["serviceItems[" + i + "].puseId"] = puseId;
- param["serviceItems[" + i + "].count"] = num;
- projIds += puseId;
- });
-
- if (projIds == "") {
- layer.alert("请选择要消耗的项目!");
- return false;
- }
- return true;
- },
- afterSubmit: function (loj) {
- var msg = '';
- if (loj.attr("result").status == '200') {
- msg = '消耗成功';
- layer
- .open({
- shade: false,
- content: msg,
- className: 'showBox',
- time: 1,
- end: function (
- elem) {
- history.back(-1);
- }
- });
- }
- }
- });
- $(".check").uCheck('enable');
-
-
- });
-
- })
-</script>
-
-<script type="text/javascript">
-
- $(function () {
- var d = new Date();
- if (d.getMonth() + 1 < 10) {
- var mon = "0" + d.getMonth();
- }
- if (d.getDate() < 10) {
- var da = "0" + d.getDate();
- }
-
- var date1 = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
- var date2 = d.getFullYear() + "-" + (d.getMonth() + 2) + "-" + d.getDate();
-
-
- var calendardatetime = new LCalendar();
- calendardatetime.init({
- 'trigger': '#time',
- 'type': 'datetime',
- 'minDate': date1, //最小日期
- 'maxDate': date2 //最大日期
- });
- });
-
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-start-service.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-start-service.html
deleted file mode 100644
index 249976b..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-start-service.html
+++ /dev/null
@@ -1,298 +0,0 @@
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderUseNew.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/plugin/LCalendar/src/css/LCalendar.css}">
-<style>
- .inputBtn{
- margin-bottom:10px;
- }
-</style>
-</head>
-<script>
-
-</script>
-<body>
- <!-- 待预约详情页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order-use-waitservice}" class="">
- <i class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">开始服务</a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav"></div> -->
- </header>
- <!-- 头部结束 -->
-
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="main main2">
- <input autocomplete="off" type="hidden" id="serviceId" name="id"
- value="${projServices.id }" />
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务编号</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.serviceNo }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">客户姓名</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.vipName }"></span>
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">下单顾问</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.createStaffName }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">创建时间</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label"
- th:text="${#dates.format(projServices.createTime,'yyyy-MM-dd HH:mm')}"
- > </span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">配料师</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.plsName }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">美疗师</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:each="item:${projServices.beauticianStates }">
- <span th:if="${projServices.beauticianId eq item.beautiStaffInfo.suId}" th:text="'【主：'+${item.beautiStaffInfo.suName }+'】' >"></span>
- <span th:if="${projServices.beauticianId ne item.beautiStaffInfo.suId}" th:text="'【'+${item.beautiStaffInfo.suName }+'】' >"></span>
- <br>
- </span>
- </div>
- </div>
-
-
- <c:if test="">
- <div th:if="${not empty projServices.projUses}" th:each="item:${projServices.projUses }">
- <hr>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">项目名称</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.name }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">剩余次数</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.surplusCount }"></span>
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务时长</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${item.projInfo.timeLength }"></span>
- </div>
- </div>
-
- </div>
-
- <hr>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">预约时间</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${#dates.format(projServices.yyTime,'yyyy-MM-dd HH:mm')}" >
- </span>
- </div>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务开始时间</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${#dates.format(projServices.startTime,'yyyy-MM-dd HH:mm')}">
- </span>
- </div>
- </div>
- </div>
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">服务预计时长</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${projServices.totalTime }">
- 分钟 </span>
- </div>
- </div>
- </div>
-
-
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">预约床位</span>
- </div>
- <div class="am-u-sm-8">
- <div>
- <span class="am-input-group-label" th:text="${projServices.bedName }">
- </span>
- </div>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">备注</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.remark }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">皮肤状况</span>
- </div>
- <div class="am-u-sm-8">
- <span class="am-input-group-label" th:text="${projServices.skinCond }"></span>
- </div>
- </div>
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">其他信息</span>
- </div>
-
- </div>
-
- <div class="inputBtn">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="toResult()">开始服务</button>
-
- </div>
- </form>
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/LCalendar/src/js/LCalendar.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- function toResult() {
- var id = $("#serviceId").val();
- var url = basePath+"/admin/projService/startService?id=" + id;
- $
- .AjaxProxy()
- .invoke(
- url,
- function(loj) {
- console.log(loj);
- if (loj.status = '200') {
- layer
- .open({
- content : "服务开始~",
- className : 'shouBox',
- time : 2,
- end : function(elem) {
- MTools
- .redirect( basePath+"/admin/redirect/hive/mobile/order-use-waitservice");
- }
- });
-
- }
- })
- }
- </script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-time.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-time.html
deleted file mode 100644
index b4e9595..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-time.html
+++ /dev/null
@@ -1,260 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingPersonalCar.css}" >
-
-
-
-
-<link rel="stylesheet" type="text/css"
- th:href="@{/plugin/LCalendar/src/css/LCalendar.css}">
-</head>
-<body>
- <!-- 购物车页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header" class="am-header color-w back-m1">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/order-use?foot=3}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 新建消耗 </a>
- </h1>
-
- <!-- <div class="am-header-right am-header-nav">
- <a href="###" class=""> <i class="am-header-icon am-icon-bars"></i>
- </a>
- </div> -->
- </header>
- <!-- 头部结束 -->
-
- <!-- 购物车表单开始 -->
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="main main1">
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <div class="am-list-news-bd">
- <ul class="am-list" id="ul_order_use">
-
- </ul>
- </div>
- </div>
- <div id="submitBtn">
- <div class="am-input-group am-form-group am-input-group-primary am-g">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">预约时间</span>
- </div>
- <!--
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" readonly="readonly"
- name="yyTime" class="am-form-field datetimepicker" />
- -->
- </div>
- <div class="am-u-sm-8">
- <div>
- <input autocomplete="off" id="demo2" type="text" readonly="" placeholder="日期和时间选择特效" value="2016-05-11 17:44" data-lcalendar="2016-05-11,2016-05-11" />
- </div>
- </div>
- </div>
- <div class="inputBtn">
- <button class="am-btn btn-m1 am-radius am-btn-block"
- type="button" onclick="myForm.submit()">消耗</button>
- </div>
- </div>
- </div>
- </form>
- <div>
- <input autocomplete="off" id="demo1" type="text" readonly="" placeholder="日期选择特效" data-lcalendar="2016-05-11,2016-05-11" />
- </div>
-
- <div>
- <input autocomplete="off" id="demo3" type="text" readonly="" placeholder="时间选择特效" />
- </div>
- <div>
- <input autocomplete="off" id="demo4" type="text" readonly="" placeholder="年月选择特效" />
- </div>
-
- <!-- 购物车表单结束 -->
-
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- $('.datetimepicker').datetimepicker({
- format : "yyyy-mm-dd hh:ii",
- autoclose: true,
- });
-
- //查询消耗列表 isOver=1表示完成，isOver=2未完成
- $(function() {
- $
- .AjaxProxy({
- p : {
- isOver : 2
- }
- })
- .invoke(
- basePath+"/admin/projService/findAllUnUseService",
- function(loj) {
- var html = "";
- var ids = "";
- if(loj.getRowCount()>0){
-
- for (var i = 0; i < loj.getRowCount(); i++) {
- html += ' <li class=" lic am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-right " >'
- + '<div class=" am-u-sm-2 am-list-thumb ">'
- + '<label class=" am-checkbox ">'
- + '<input autocomplete="off" type="checkbox" name="projUses['+i+'].id" class="check " value='
- + loj.getString(i, "id")
- + '>'
- + '</label>'
- + '</div>'
- + '<div class=" am-u-sm-7 am-list-main">'
- + '<h3 class="am-list-item-hd">';
- if (loj.getString(i, "projInfo")) {
- html += loj.getString(i, "projInfo").projName
- } else {
- html += loj.getString(i, "taocanInfo").name
- }
- html += '</h3>'
-
- + ' </div>'
- + '<div class="am-u-sm-3 am-list-thumb">'
- + ' <span>余'
- + loj.getString(i, "surplusCount")
- + '次</span>' + '</div>' + ' </li>';
-
- }
- }else{
- html="没有可消耗的项目！"
- $("#submitBtn").hide();
- }
- //显示数据
- $("#ul_order_use").html(html);
-
- //初始化表单
- myForm = MForm
- .initForm({
- invokeUrl : basePath+"/admin/projService/addService",
- afterSubmit : function(loj) {
- var msg = '';
- if (loj.attr("result").status == '200') {
- msg = '消耗成功';
- layer
- .open({
- shade : false,
- content : msg,
- className : 'showBox',
- time : 1,
- end : function(
- elem) {
- MTools
- .redirect( basePath+"/admin/redirect/hive/mobile/order-use");
- }
- });
- }
- }
- });
-
- });
- });
-
- $(function() {
- $(".check").uCheck('enable');
- })
- </script>
-</body>
- <script
- th:src="@{/plugin/LCalendar/src/js/LCalendar.js}"></script>
- <script>
- var calendar = new LCalendar();
- calendar.init({
- 'trigger': '#demo1', //标签id
- 'type': 'date', //date 调出日期选择 datetime 调出日期时间选择 time 调出时间选择 ym 调出年月选择,
- 'minDate': '1900-1-1', //最小日期
- 'maxDate': new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() //最大日期
- });
- var calendardatetime = new LCalendar();
- calendardatetime.init({
- 'trigger': '#demo2',
- 'type': 'datetime'
- });
- var calendartime = new LCalendar();
- calendartime.init({
- 'trigger': '#demo3',
- 'type': 'time'
- });
- var calendarym = new LCalendar();
- calendarym.init({
- 'trigger': '#demo4',
- 'type': 'ym',
- 'minDate': '1900-1',
- 'maxDate': new Date().getFullYear() + '-' + (new Date().getMonth() + 1)
- });
- </script>
-
-
-</html>
-
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order.html
deleted file mode 100644
index 4a95988..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/order.html
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<meta http-equiv="Cache-Control" content="no-transform" />
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-<head>
-<script>
- if (window.top !== window.self) {
- window.top.location = window.location
- };
-</script>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-
-<!-- Tile icon for Win8 (144x144 + tile color) -->
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrder.css}">
-
-</head>
-<body>
- <!-- 订单管理页面 -->
- <!-- 判断会员是否存在 -->
-
- <div class="wrap">
- <!-- 图片栏开始 -->
- <div data-am-widget="slider" class="am-slider am-slider-c2"
- data-am-slider='{"directionNav":false}'>
- <ul class="am-slides">
- <li><img th:src="@{/images/dingImg/banner-img6.jpg}">
- <div class="am-slider-desc" th:text="${session.userInfo.shopName }"></div></li>
- </ul>
- </div>
- <!-- 图片结束 -->
- <!-- 会员信息开始 -->
-
-
- <div class="am-panel am-panel-secondary">
- <div class="am-panel-hd">
- <!-- 用来记录等级信息是否显示 -->
- <input autocomplete="off" type="hidden" vlaue="1" id="hidval">
- <h2 class="am-panel-title" id="vipLevel" th:if="${session.CURRENT_CUSTOMER ne null }" >
- <span th:text="${session.CURRENT_CUSTOMER?.vipName }" ></span>
- <a th:href="@{/admin/redirect/hive/mobile/order-search}"> |<small>切换会员</small></a>
- </h2>
- <h2 class="am-panel-title" id="vipLevel" th:if="${session.CURRENT_CUSTOMER eq null }">
- <a th:href="@{/admin/redirect/hive/mobile/order-search}"> |<small>切换会员</small></a>
- </h2>
- <span class="down" alt="等级详情"></span>
- </div>
- <div class="vipMsg">
- <ul class="am-list am-list-static am-list-border">
- <li th:text="'会员手机: '+${session.CURRENT_CUSTOMER?.phone }"></li>
- <li th:text="'会员积分:'+${session.CURRENT_CUSTOMER?.pointAll }"></li>
- </ul>
- </div>
- </div>
-
- <!--会员信息结束 -->
- <!-- 表格部分开始 -->
- <ul class="am-avg-sm-4 boxes " id="boxs">
-
- <li class="box box-1"><a
- th:href="@{/admin/redirect/hive/mobile/order-list}"> <img
- th:src="@{/images/dingImg/xjdd.png}"></img><br>
- <small class="boxs">新建订单</small>
- </a></li>
-
-
- <li class="box box-2"><a
- th:href="@{/admin/redirect/hive/mobile/order-car}"> <img
- th:src="@{/images/dingImg/gwc.png}"></img><br>
- <small class="boxs">购物车</small>
- </a></li>
-
-
-
- <li class="box box-3"><a
- th:href="@{/admin/redirect/hive/mobile/order-history}"> <img
- th:src="@{/images/dingImg/wcdd.png}"></img><br> <small
- class="boxs">订单</small>
- </a></li>
-
- <li class="box box-1"><a
- th:href="@{/admin/redirect/hive/mobile/order-use-new}"> <img
- th:src="@{/images/dingImg/cjff.png}"></img><br> <small
- class="boxs">创建服务</small>
- </a></li>
-
- <li class="box box-4"><a
- th:href="@{/admin/redirect/hive/mobile/order-use-completed}"> <img
- th:src="@{/images/dingImg/xmfw.png}"></img><br>
- <small class="boxs">项目服务</small>
- </a></li>
-
-
- </ul>
- <!-- 表格结束 -->
- <!-- 表格结束 -->
-
- <!-- foot开始 -->
- <div class="footr" th:fragment="footr">
- <div data-am-widget="navbar" class="am-navbar am-cf am-navbar-default "
- id="">
- <ul class="am-navbar-nav am-cf am-avg-sm-4">
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/personal?foot=1}"class="change1" >
- <img th:src="@{/images/dingImg/grzx2.png}" alt="个人中心"/>
- <span class="am-navbar-label ">个人中心</span>
- </a>
- </li>
-
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/CRM?foot=3}" class="change3">
- <img th:src="@{/images/dingImg/crm1.png}" alt="订单管理"/>
- <span class="am-navbar-label">CRM</span>
- </a>
- </li>
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/order?foot=4}" class="change4">
- <img th:src="@{/images/dingImg/ddgl1.png}" alt="商机管理"/>
- <span class="am-navbar-label">订单管理</span>
- </a>
- </li>
-
- </ul>
- </div>
- </div>
-
- <!-- foot结束 -->
-
- </div>
-
-
-
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- $(function() {
- $("#vipLevel").bind("click", function() {
-
- if ($("#hidval").val() == 1) {
- $(".vipMsg").find('li').css('border','0');
- $(".down").css("transform", "rotate(0deg)");
- $(".vipMsg").slideUp(500, function() {
- $("#hidval").val(0);
-
-
- })
- } else {
- $(".down").css("transform", "rotate(180deg)");
- $(".vipMsg").slideDown(500, function() {
- $("#hidval").val(1);
- $(".vipMsg").find('li').css('border-bootom','1px solid #eee');
-
- })
- }
-
- })
- });
- $(function(){
- var count=$("#boxs").find("li").length;
- var index=count%4;
- if(index==1){
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
- if(index==2){
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
- if(index==3){
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
- })
-
-
- $(function(){
- var id=$.query.get('foot');
-
-
-
-
- $(".change"+id).children("span").css('color','#dfbd88');
- switch(id){
- case 1:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/grzx.png');
-
- break;
-
- case 2:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/customer3.png');
-
- break;
- case 3:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/crm.png');
-
- break;
-
- case 4:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/ddgl.png');
-
- break;
- default:
- $(".change1").children("span").css('color','#dfbd88');
- $(".change1").children("img").attr('src',basePath+'/images/dingImg/grzx.png');
-
- }
-
-
-
- });
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-msg.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-msg.html
deleted file mode 100644
index c5971e3..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-msg.html
+++ /dev/null
@@ -1,288 +0,0 @@
-
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-<style>
- #img1_img {
- width: 100px;
- height: 100px;
- }
-</style>
-</head>
-<body>
-
- <!-- 个人资料修改页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/personal?foot=1}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 个人资料 </a>
- </h1>
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 会员注册表单开始 -->
- <div class="main main2">
- <form class="am-form am-form-horizontal" method="post" id="dataform"
- onsubmit="javascripr:return false;">
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">头像</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" th:value="${obj.suPhoto}" name="suPhoto" id="img1"
- class="form-control upload-input" type="text" /> <a
- class="btn btn-primary radius upload-a">
- </a>
- </div>
- </div>
-
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">姓名</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" dataType="*1-20" class="am-form-field"
- name="suName" th:value="${obj.suName}">
- </div>
- </div>
-
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">英文名</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" dataType="*1-20" class="am-form-field"
- th:value="${obj.enName }" name="enName" ignore="ignore">
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">编号</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" dataType="*1-30" class="am-form-field"
- readonly="readonly" th:value="${obj.suJobNo}" />
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">身份证号码</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" dataType="*1-30" class="am-form-field"
- name="suIdcard" th:value="${obj.suIdcard}">
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">联系电话</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" dataType="m" class="am-form-field"
- ignore="ignore" name="suTel" th:value="${obj.suTel}">
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">紧急联系电话</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" dataType="m" class="am-form-field"
- ignore="ignore" name="emergTel" th:value="${obj.emergTel}">
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">住址</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" dataType="*1-200" class="am-form-field"
- ignore="ignore" name="suAddress" th:value="${obj.suAddress}">
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">微信号</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" dataType="*1-40" class="am-form-field"
- ignore="ignore" name="wxNo" th:value="${obj.wxNo}">
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">生日</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="date" class="am-form-field" name="suBirthday"
- dataType="*" th:value="${obj.suBirthday}">
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">所属门店</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field" readonly="readonly"
- dataType="*" th:value="${obj.shopName}">
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">所属岗位</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field" readonly="readonly" dataType="*"
- th:value="${obj.roleName}">
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">上级领导</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field" readonly="readonly"
- th:value="${obj.parDirectName}">
- </div>
- </div>
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">工作经历</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="text" class="am-form-field" name="workExp"
- ignore="ignore" dataType="*1-200" th:value="${obj.workExp}">
- </div>
- </div>
- <div
- class="am-form-group am-input-group am-input-group-primary am-g ">
- <div class="am-u-sm-4">
- <span class="am-input-group-label ">服务签名</span>
- </div>
- <div class="am-u-sm-8">
- <textarea name="serviceSignature" class="border" clos="100"
- rows="3" warp="virtual" dataType="*1-300" ignore="ignore" th:text="${obj?.serviceSignature }" ></textarea>
- </div>
- </div>
-
- <div class="inputBtn">
- <input autocomplete="off" type="button" onclick="myForm.submit()"
- class="am-btn btn-m1 am-radius am-btn-block" value="保存"></input>
- </div>
- </form>
- </div>
- <!-- 会员到访表单结束 -->
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/js/systools/AjaxProxyVue.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- MTools.initImgUpload(".upload-input");
- var myForm;
- $(function() {
- myForm = MForm.initForm({
- invokeUrl : basePath+"/admin/updateStaffInfo",
- afterSubmit : function(loj) {
- if (loj.status = '200') {
- layer.open({
- shade : false,
- content : '修改成功',
- className : 'showBox',
- time : 2
- });
- }
- }
- });
-
-
- });
-
-
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-resetPassWord.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-resetPassWord.html
deleted file mode 100644
index 4970371..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-resetPassWord.html
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
-
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-
-</head>
-<body>
- <!-- 个人资料修改页面 -->
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/personal?foot=1}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 重置密码 </a>
- </h1>
-
- </header>
- <!-- 头部结束 -->
-
- <div class="main main2">
-
- <form class="am-form am-form-horizontal" method="post" id="dataform"
- onsubmit="javascripr:return false;">
-
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">原始密码</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="password" class="am-form-field " dataType="*"
- name="oldPassword" placeholder="原始密码" nullmsg="请填写原始密码">
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">新密码</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="password" class="am-form-field " dataType="*"
- name="newPassword" placeholder="新密码" nullmsg="请填写新密码"
- errormsg="长度为6至16">
- </div>
- </div>
-
- <div
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-4">
- <span class="am-input-group-label">确认密码</span>
- </div>
- <div class="am-u-sm-8">
- <input autocomplete="off" type="password" class="am-form-field " dataType="*"
- name="reNewPassword" recheck="newPassword" placeholder="重复新密码"
- nullmsg="请重复新密码" errormsg="请填写相同密码">
- </div>
- </div>
-
- <div class="inputBtn">
- <input autocomplete="off" type="button" onclick="myForm.submit()"
- class="am-btn btn-m1 am-radius am-btn-block" value="保存"></input>
- </div>
-
- </form>
- </div>
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
-
-
- var myForm = MForm
- .initForm({
- invokeUrl : basePath+"/admin/updatePassword",
- afterSubmit : function(loj) {
- if (loj.status = '200') {
- layer
- .open({
- shade : false,
- content : '密码修改成功',
- className : 'showBox',
- time : 2,
- end : function(elem) {
- MTools
- .redirect( basePath+"/admin/redirect/hive/mobile/personal?foot=1");
- }
- });
- }
- }
- });
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-shop-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-shop-list.html
deleted file mode 100644
index c0bcf1e..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-shop-list.html
+++ /dev/null
@@ -1,279 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-<style type="text/css">
-.m_ul{
- list-style: none;
-}
-
-.m_ul li span{
-margin-left: 2em;
-}
-</style>
-</head>
-
-
-
-<body>
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/personal?foot=1" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">门店列表 </a>
- </h1>
-
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1" id="main" style="display: none;">
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
-
- <!-- <div class="am-u-sm-4 margin-b1">
- <select name=absentDay id="order-select" class=" border" >
- <option value=''>未到店日期</option>
- <option value="3">3天</option>
- <option value="7">7天</option>
- <option value="14">14天</option>
- </select>
- </div>
- <div class="am-u-sm-4 margin-b1">
- <select name="birthdays" class=" border" >
- <option value=''>生日</option>
- <option value="1">今天</option>
- <option value="3">3天内</option>
- <option value="30">一个月</option>
- </select>
- </div>
- <div class="am-u-sm-4 margin-b1">
- <select name="followDays" class=" border" >
- <option value=''>跟进</option>
- <option value="1">今天</option>
- <option value="3">3天内</option>
- <option value="30">一个月</option>
- </select>
- </div>
- <label class="col-sm-2 control-label">会员活跃度</label>
- <div class="am-u-sm-4 margin-b1" >
- <select name="appointDays" class=" border" >
- <option value=''>预约</option>
- <option value="1">今天</option>
- <option value="3">3天内</option>
- <option value="30">一个月</option>
- </select>
- </div> -->
-
- <div class="am-u-sm-8 ">
- <input autocomplete="off" type="text" class="searchIn" name="shopName" placeholder="门店名称" />
- <!-- <label class="col-sm-2 control-label">会员等级</label> -->
-
-
- </div>
- <div class="am-u-sm-4 ">
- <button type="button"
- class="am-btn am-btn-default am-radius searchBtn"
- onclick="Pagination.serchDate()">搜索</button>
- </div>
-
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" name="limit" id="limit" value="10" />
- </div>
- <!-- <ul class="m_ul">
- <li>生日：<span class="am-badge am-badge-secondary am-radius" kind="1" day="0" > 今天 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="1" day="3" > 3天内 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="1" day="30" > 一月内 </span></li>
-
- <li>跟进：<span class="am-badge am-badge-secondary am-radius" kind="2" day="0" > 今天 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="2" day="3" > 3天内 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="2" day="30" > 一月内 </span></li>
- <li>预约：<span class="am-badge am-badge-secondary am-radius" kind="3" day="0" > 今天 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="3" day="3" > 3天内 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="3" day="30" > 一月内 </span></li>
- </ul> -->
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-9 ">
- <h2 class="am-list-news-more am-fr">门店名称</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">操作</h2>
- </div>
- </div>
- <div class="am-list-news-bd">
- <ul class="am-list am-list-striped" id="showdataBox">
-
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px"></div>
- </div>
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
- /**
- 加载数据
- **/
- $(function() {
- var pageSize=$("#limit").val();
- Pagination
- .init(
- {
- url : basePath+"/admin/achieveTargetShop/showList",
- pageSize : pageSize,
- builderDate : function(loj) {
- if (loj.getRowCount() > 0) {
- $("#main").show();
- var html = "";
- //构建数据
- for (var i = 0; i < loj.getRowCount(); i++) {
-
- html += ' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + loj.getString(i,"shopName") + '</h3> </div> '
- +'<div class="am-u-sm-3 "><a class="am-list-item-hd" th:href="@{/admin/achieveTargetShop/dayAchieve?id='+ loj.getString(i, "id")+ '&lookInfo=0">查看业绩</a></div></li>';
- }
- return html;
- } else {
- $("#pagingBox").hide();
-
-
- }
- }
- }).serchDate();
-
-
- //筛选点击事件
-
-
-
- $(".m_ul li span").click(function(){
-
- var normal="am-badge am-badge-secondary am-radius";
- var selected="am-badge am-badge-warning am-radius";
- var myAttr= $(this).attr("class");
- if(myAttr==selected){
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",normal);
- Pagination.serchDate();
- }else{
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",selected);
- onserch($(this).attr("kind"),$(this).attr("day"))
- }
-
- });
-
- //下拉框
- MTools.autoFullSelect();
- //
- //style="display:none"
- $(".option1").css("display","none");
- $(".option2").css("display","none");
-
- }
- );
- function option(){
- $(".option").removeAttr("selected");
- $('.time').attr('selected', true);
- if($("#select").val() != null && $("#select").val() != ""){
- if($("#select").val() != "absentDay"){
- $(".option1").css("display","none");
- $(".option2").css("display","block");
- }else{
- $(".option2").css("display","none");
- $(".option1").css("display","block");
- }
- }else{
- $(".option1").css("display","none");
- $(".option2").css("display","none");
- }
- }
-
- /*条件筛选加载
- function onserch(kind,day){
-
- $.AjaxProxy({p:{"kind":kind,"day":day}}).invoke( basePath+"/admin/customer/showCustomerByDay",function(loj){
-
- if (loj.getRowCount() > 0) {
- var html = "";
- //构建数据
- for (var i = 0; i < loj.getRowCount(); i++) {
- html += ' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">'+ loj.getString(i,"vipName") + '</h3> </div>'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + loj.getString(i, "phone") + '</h3> </div> '
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + loj.getString(i, "vipLevel").levelName + '</h3> </div> '
- +'<div class="am-u-sm-3 "><a class="am-list-item-hd" href="tel:'+phone+'">拨号</a><a class="am-list-item-hd" th:href="@{/admin/customer/toVipInfoList?id='+ loj.getString(i, "id")+ '">详情</a></div></li>';
- }
- $("#showdataBox").html(html);
- $("#pagingBox").html("");
- } else {
- $("#showdataBox").html("<hr><div class='am-u-sm-6 am-u-sm-centered '>没有查询到相关数据~</div>");
- $("#pagingBox").html("");
-
- }})};
-
- */
-
-
-
-
-
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-staff-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-staff-list.html
deleted file mode 100644
index 86314bc..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-staff-list.html
+++ /dev/null
@@ -1,302 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-<style type="text/css">
-.m_ul{
- list-style: none;
-}
-
-.m_ul li span{
-margin-left: 2em;
-}
-</style>
-</head>
-
-
-
-<body>
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/personal?foot=1" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">员工列表 </a>
- </h1>
-
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1" id="main" style="display: none;">
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-6 margin-b1">
- <select class="form-control autoFull"
- th:data-url="@{/admin/achieveTargetShop/findShopByRole}"
- data-value="id"
- data-filed="shopName"
- name="shopId"
- id="shopId">
- <option value="">--门店选择--</option>
- </select>
- </div>
-
- <!-- <label class="col-sm-2 control-label">会员活跃度</label> -->
- <div class="am-u-sm-6 margin-b1" >
- <select class="form-control" name="staffPost">
- <option value=''>--员工岗位--</option>
- <option value='1'>健康顾问</option>
- <option value='2'>美疗师</option>
- </select>
- </div>
-
- <!-- <div class="am-u-sm-4 margin-b1">
- <select name=absentDay id="order-select" class=" border" >
- <option value=''>未到店日期</option>
- <option value="3">3天</option>
- <option value="7">7天</option>
- <option value="14">14天</option>
- </select>
- </div>
- <div class="am-u-sm-4 margin-b1">
- <select name="birthdays" class=" border" >
- <option value=''>生日</option>
- <option value="1">今天</option>
- <option value="3">3天内</option>
- <option value="30">一个月</option>
- </select>
- </div>
- <div class="am-u-sm-4 margin-b1">
- <select name="followDays" class=" border" >
- <option value=''>跟进</option>
- <option value="1">今天</option>
- <option value="3">3天内</option>
- <option value="30">一个月</option>
- </select>
- </div>
- <label class="col-sm-2 control-label">会员活跃度</label>
- <div class="am-u-sm-4 margin-b1" >
- <select name="appointDays" class=" border" >
- <option value=''>预约</option>
- <option value="1">今天</option>
- <option value="3">3天内</option>
- <option value="30">一个月</option>
- </select>
- </div> -->
-
- <div class="am-u-sm-8 ">
- <input autocomplete="off" type="text" class="searchIn" name="staffName" placeholder="员工姓名" />
- <!-- <label class="col-sm-2 control-label">会员等级</label> -->
-
-
- </div>
- <div class="am-u-sm-4 ">
- <button type="button"
- class="am-btn am-btn-default am-radius searchBtn"
- onclick="Pagination.serchDate()">搜索</button>
- </div>
-
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" name="limit" id="limit" value="10" />
- </div>
- <!-- <ul class="m_ul">
- <li>生日：<span class="am-badge am-badge-secondary am-radius" kind="1" day="0" > 今天 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="1" day="3" > 3天内 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="1" day="30" > 一月内 </span></li>
-
- <li>跟进：<span class="am-badge am-badge-secondary am-radius" kind="2" day="0" > 今天 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="2" day="3" > 3天内 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="2" day="30" > 一月内 </span></li>
- <li>预约：<span class="am-badge am-badge-secondary am-radius" kind="3" day="0" > 今天 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="3" day="3" > 3天内 </span>
- <span class="am-badge am-badge-secondary am-radius" kind="3" day="30" > 一月内 </span></li>
- </ul> -->
-
- <!-- 商品表格 -->
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-4 ">
- <h2 class="am-list-news-more am-fr">员工姓名</h2>
- </div>
- <div class="am-u-sm-4 ">
- <h2 class="am-list-news-more am-fr">所属门店</h2>
- </div>
- <div class="am-u-sm-4 ">
- <h2 class="am-list-news-more am-fr">操作</h2>
- </div>
- </div>
- <div class="am-list-news-bd">
- <ul class="am-list am-list-striped" id="showdataBox">
-
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px"></div>
- </div>
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
- /**
- 加载数据
- **/
- $(function() {
- var pageSize=$("#limit").val();
- Pagination
- .init(
- {
- url : basePath+"/admin/achieveTarget/showAllMlsAndJkgw",
- pageSize : pageSize,
- builderDate : function(loj) {
- if (loj.getRowCount() > 0) {
- $("#main").show();
- var html = "";
- //构建数据
- for (var i = 0; i < loj.getRowCount(); i++) {
-
- html += ' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">'+ loj.getString(i,"staffName") + '</h3> </div>'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + loj.getString(i,"shopName") + '</h3> </div> '
- +'<div class="am-u-sm-3 "><a class="am-list-item-hd" th:href="@{/admin/achieveTarget/dayAchieve?id='+ loj.getString(i, "id")+ '&lookInfo=0">查看业绩</a></div></li>';
- }
- return html;
- } else {
- $("#pagingBox").hide();
-
-
- }
- }
- }).serchDate();
-
-
- //筛选点击事件
-
-
-
- $(".m_ul li span").click(function(){
-
- var normal="am-badge am-badge-secondary am-radius";
- var selected="am-badge am-badge-warning am-radius";
- var myAttr= $(this).attr("class");
- if(myAttr==selected){
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",normal);
- Pagination.serchDate();
- }else{
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",selected);
- onserch($(this).attr("kind"),$(this).attr("day"))
- }
-
- });
-
- //下拉框
- MTools.autoFullSelect();
- //
- //style="display:none"
- $(".option1").css("display","none");
- $(".option2").css("display","none");
-
- }
- );
- function option(){
- $(".option").removeAttr("selected");
- $('.time').attr('selected', true);
- if($("#select").val() != null && $("#select").val() != ""){
- if($("#select").val() != "absentDay"){
- $(".option1").css("display","none");
- $(".option2").css("display","block");
- }else{
- $(".option2").css("display","none");
- $(".option1").css("display","block");
- }
- }else{
- $(".option1").css("display","none");
- $(".option2").css("display","none");
- }
- }
-
- /*条件筛选加载
- function onserch(kind,day){
-
- $.AjaxProxy({p:{"kind":kind,"day":day}}).invoke( basePath+"/admin/customer/showCustomerByDay",function(loj){
-
- if (loj.getRowCount() > 0) {
- var html = "";
- //构建数据
- for (var i = 0; i < loj.getRowCount(); i++) {
- html += ' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">'+ loj.getString(i,"vipName") + '</h3> </div>'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + loj.getString(i, "phone") + '</h3> </div> '
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + loj.getString(i, "vipLevel").levelName + '</h3> </div> '
- +'<div class="am-u-sm-3 "><a class="am-list-item-hd" href="tel:'+phone+'">拨号</a><a class="am-list-item-hd" th:href="@{/admin/customer/toVipInfoList?id='+ loj.getString(i, "id")+ '">详情</a></div></li>';
- }
- $("#showdataBox").html(html);
- $("#pagingBox").html("");
- } else {
- $("#showdataBox").html("<hr><div class='am-u-sm-6 am-u-sm-centered '>没有查询到相关数据~</div>");
- $("#pagingBox").html("");
-
- }})};
-
- */
-
-
-
-
-
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials-data.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials-data.html
deleted file mode 100644
index 17140db..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials-data.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-
-</head>
-<body>
- <!-- 个人资料修改页面 -->
- <!-- 头部开始 -->
- <input autocomplete="off" type="hidden" id="typeId" th:value="${param.id}">
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a href="javascript:history.back(-1)" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">HIVE学院</a>
- </h1>
-
- </header>
- <!-- 头部结束 -->
-
- <div class="" >
- <ul class="am-list" id="accordion">
-
-
-
- </ul>
- </div>
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
- <script type="text/javascript">
- //文章加载
- $(function(){
- $.AjaxProxy({p:{typeId:$("#typeId").val()},a:false}).invoke( basePath+"/admin/trainingArticle/queryTrainingMaterials",function(loj) {
- var html="";
- for (var i = 0; i < loj.getRowCount(); i++) {
- html=html+" <li class='am-g'>"
- +"<a href='"+basePath+"/admin/trainingArticle/queryOne?id="+loj.getString(i, "id")+"\' class='am-list-item-hd ' style='padding-left: 10px;color: black;'>"
- +loj.getString(i, "title")
- +"</a>"
- +"<span class='am-list-date am-icon-angle-right go-right'></span> </li>"
- }
- $("#accordion").empty().html(html);
- if(html==""){
-
- }
- })
-
- })
-
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials-info.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials-info.html
deleted file mode 100644
index 15fcbf5..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials-info.html
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<!-- Add to homescreen for Chrome on Android -->
-<meta name="mobile-web-app-capable" content="yes">
-
-
-<!-- Add to homescreen for Safari on iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black">
-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
-
-<meta name="msapplication-TileColor" content="#0e90d2">
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-<style type="text/css">
-img {
- max-width:100% !important;
-}
-.writer{
- padding:10px;
-}
-</style>
-</head>
-<body>
- <!-- 个人资料修改页面 -->
- <!-- 头部开始 -->
-
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a href="javascript:history.back(-1)" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="" th:text="${article.title}"> </a>
- </h1>
-
- </header>
- <!-- 头部结束 -->
-
- <div class="writer" th:utext="${article.content}" >
-
-
- </div>
-
- <script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
- <script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <!-- index js -->
-
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials1.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials1.html
deleted file mode 100644
index 0842fdd..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials1.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-
-
-</head>
-<body>
-<!-- 个人资料修改页面 -->
-<!-- 头部开始 -->
-<header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a href="javascript:history.back(-1)" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">HIVE学院 </a>
- </h1>
-
-</header>
-<!-- 头部结束 -->
-<div class="">
- <ul class="am-list" id="accordion">
-
-
- <li class="am-g" th:each="item:${articlelist}">
- <a th:href="@{/admin/trainingArticle/queryM?id=}+${item.id}" id="a1" class="am-list-item-hd" th:text=" ${item.articleTypeName}"
- style="padding-left: 10px;color: black;">
-
- </a>
- </li>
-
-
- </ul>
-</div>
-
-<script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
- $(function () {
- if ('${empty articleList}' == 'true') {
-
- }
- })
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials2.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials2.html
deleted file mode 100644
index f5a576e..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials2.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{/css/dingUserVip.css}">
-
-
-</head>
-<body>
-<!-- 个人资料修改页面 -->
-<!-- 头部开始 -->
-<header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a href="javascript:history.back(-1)" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">HIVE学院 </a>
- </h1>
-
-</header>
-<!-- 头部结束 -->
-<div class="">
- <ul class="am-list" id="accordion">
-
-
-
- <li class="am-g" th:each="item:${articleList}">
- <a th:href="@{/admin/redirect/hive/mobile/personal-trainingMaterials-data?id=}+${item.id}" id="a1" class="am-list-item-hd" th:text=" ${item.articleTypeName}"
- style="padding-left: 10px;color: black;">
- </a>
- </li>
-
-
- </ul>
-</div>
-
-<script type="text/x-handlebars-template" id="amz-tpl">
- {{>header header}}
-
- {{>menu menu}}
-
- {{>slider slider}}
-
- {{>list_news list1}}
-
- {{>gallery gallery}}
-
- {{>list_news list2}}
-
- {{>footer footer}}
-
- {{>navbar navbar}}
-</script>
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
- $(function () {
- if ('${empty articleList}' == 'true') {
-
- }
- })
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal.html
deleted file mode 100644
index b077c2d..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal.html
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
- <meta http-equiv="Cache-Control" content="no-transform" />
-<meta http-equiv="Cache-Control" content="no-siteapp" />
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
-
- <!-- No Baidu Siteapp-->
- <meta http-equiv="Cache-Control" content="no-siteapp"/>
-
-
-
- <!-- Add to homescreen for Chrome on Android -->
- <meta name="mobile-web-app-capable" content="yes">
-
-
- <!-- Add to homescreen for Safari on iOS -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="Amaze UI"/>
-
-
- <!-- Tile icon for Win8 (144x144 + tile color) -->
-
- <meta name="msapplication-TileColor" content="#0e90d2">
- <script type="text/javascript"th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingOrder.css}">
-
-</head>
-<body>
- <!-- 个人中心页面 -->
- <div class="wrap">
-
- <!-- 图片栏开始 -->
- <div data-am-widget="slider" class="am-slider am-slider-c2" data-am-slider='{"directionNav":false}' >
- <ul class="am-slides">
- <li>
- <img th:src="@{/images/dingImg/banner-img4.jpg}">
- <div class="am-slider-desc" th:text="${session.userInfo.shopName }"></div>
- </li>
- </ul>
- </div>
- <!-- 图片结束 -->
- <!-- 表格部分开始 -->
- <ul class="am-avg-sm-4 boxes" id="boxs">
-
- <li class="box box-4">
- <a th:href="@{/admin/goStaffEditForm}" >
- <img th:src="@{/images/dingImg/grzl.png}" ></img><br>
- <small class="boxs">个人资料</small>
- </a>
- </li>
- <li class="box box-4">
- <a th:href="@{/admin/trainingArticle/queryMaterials}" >
- <img th:src="@{/images/dingImg/mdxy.png}" ></img><br>
- <small class="boxs">HIVE学院</small>
- </a>
- </li>
- <li class="box box-4">
- <a th:href="@{/admin/occupancy/editMlsForm}" >
- <img th:src="@{/images/dingImg/mdxy.png}" ></img><br>
- <small class="boxs">占用情况</small>
- </a>
- </li>
-
- <li class="box box-4">
- <a th:href="@{/admin/redirect/hive/mobile/store-check}" >
- <img th:src="@{/images/dingImg/mdxy.png}" /><br>
- <small class="boxs">库存盘点</small>
- </a>
- </li>
-
- <li class="box box-5">
- <a th:href="@{/admin/redirect/hive/mobile/personal-resetPassWord}" >
- <img th:src="@{/images/dingImg/xgmm.png}" ></img><br>
- <small class="boxs">修改密码</small>
- </a>
- </li>
- <li class="box box-6">
- <a id="doc-confirm-toggle">
- <img th:src="@{/images/dingImg/aqtc.png}" ></img><br>
- <small class="boxs">退出</small>
- </a>
- </li>
-
- </ul>
- <!-- 表格结束 -->
-
- <div class="am-modal am-modal-confirm" tabindex="-1" id="my-confirm">
- <div class="am-modal-dialog">
- <div class="am-modal-hd">提示</div>
- <div class="am-modal-bd">
- 确定返回登录页面么?
- </div>
- <div class="am-modal-footer">
- <span class="am-modal-btn" data-am-modal-cancel>取消</span>
- <span class="am-modal-btn" data-am-modal-confirm>确定</span>
- </div>
- </div>
- </div>
- <!-- foot开始 -->
- <div class="footr" th:fragment="footr">
- <div data-am-widget="navbar" class="am-navbar am-cf am-navbar-default "
- id="">
- <ul class="am-navbar-nav am-cf am-avg-sm-4">
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/personal?foot=1}"class="change1" >
- <img th:src="@{/images/dingImg/grzx2.png}" alt="个人中心"/>
- <span class="am-navbar-label ">个人中心</span>
- </a>
- </li>
-
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/CRM?foot=3}" class="change3">
- <img th:src="@{/images/dingImg/crm1.png}" alt="订单管理"/>
- <span class="am-navbar-label">CRM</span>
- </a>
- </li>
- <li >
- <a th:href="@{/admin/redirect/hive/mobile/order?foot=4}" class="change4">
- <img th:src="@{/images/dingImg/ddgl1.png}" alt="商机管理"/>
- <span class="am-navbar-label">订单管理</span>
- </a>
- </li>
-
- </ul>
- </div>
- </div>
-
-
- <!-- foot结束 -->
- </div>
-
-
-<script th:src="@{/plugin/amazingUI/js/handlebars.min.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<!-- index js -->
-<script type="text/javascript">
-$(function() {
- $('#doc-confirm-toggle').on('click', function() {
- $('#my-confirm').modal({
- relatedTarget: this,
- onConfirm: function(options) {
- MTools.redirect(basePath + "/common/hiveMobileLoginOut");
-
- },
- // closeOnConfirm: false,
- onCancel: function() {
-
- }
- });
- });
- });
-$(function(){
- var count=$("#boxs").find("li").length;
- var index=count%4;
- if(index==1){
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
- if(index==2){
- $("#boxs").append(" <li class='box'>"+"</li>");
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
- if(index==3){
- $("#boxs").append(" <li class='box'>"+"</li>");
- }
-})
-
-
-
-
-$(function(){
- var id=$.query.get('foot');
-
-
-
-
- $(".change"+id).children("span").css('color','#dfbd88');
- switch(id){
- case 1:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/grzx.png');
-
- break;
-
- case 2:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/customer3.png');
-
- break;
- case 3:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/crm.png');
-
- break;
-
- case 4:
-
- $(".change"+id).children("img").attr('src',basePath+'/images/dingImg/ddgl.png');
-
- break;
- default:
- $(".change1").children("span").css('color','#dfbd88');
- $(".change1").children("img").attr('src',basePath+'/images/dingImg/grzx.png');
-
- }
-
-
-
-});
-
-
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/store-check-detail.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/store-check-detail.html
deleted file mode 100644
index d56899e..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/store-check-detail.html
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-<style type="text/css">
-.m_ul{
- list-style: none;
-}
-
-.m_ul li span{
-margin-left: 2em;
-}
-</style>
-</head>
-
-
-
-<body>
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/store-check}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 库存盘点 </a>
- </h1>
-
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1" id="main" style="display: none;">
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-4 ">
- <input autocomplete="off" type="text" class="searchIn" name="goods.name" placeholder="产品名称" />
- </div>
- <div class="am-u-sm-4 ">
- <button type="button"
- class="am-btn am-btn-default am-radius searchBtn"
- onclick="Pagination.serchDate()">搜索</button>
- </div>
-
- <div class="am-u-sm-4 ">
- <button type="button"
- class="am-btn am-btn-default am-radius searchBtn"
- onclick="submitDetail()">保存</button>
- </div>
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" name="limit" id="limit" value="10" />
- <input autocomplete="off" type="hidden" name="checkId" id="checkId" th:value="${obj.id }" />
- </div>
-
-
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">存货编号</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">存货名称</h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">库存数量</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">实盘数</h2>
- </div>
-<!-- <div class="am-u-sm-2 ">-->
-<!-- <h2 class="am-list-news-more am-fr">操作</h2>-->
-<!-- </div>-->
- </div>
- <div class="am-list-news-bd">
- <ul class="am-list am-list-striped" id="showdataBox">
-
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px"></div>
- </div>
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
- var temp;
- var a=[[${obj.makingManId}]];
- var b=[[${session.userInfo.suId}]];
- if (a == b) {
- temp = true;
- } else {
- temp = false;
- }
-
- var myForm = MForm.initForm({
- invokeUrl : basePath+"/admin/checkDetail/editCheckDetail",
- afterSubmit : function() {
- Pagination.serchDate();
- },
- });
-
- function submitDetail() {
- myForm.submit();
- }
- /**
- 加载数据
- **/
- $(function() {
- var pageSize=$("#limit").val();
- Pagination
- .init(
- {
- url : basePath+"/admin/checkDetail/showList",
- pageSize : pageSize,
- builderDate : function(loj) {
- if (loj.getRowCount() > 0) {
- $("#main").show();
- var html = "";
- //构建数据
- for (var i = 0; i < loj.getRowCount(); i++) {
- var result = loj[0].result.rows[i];
-
- // if (temp) {
- // html = '<input autocomplete="off" type="hidden" name="checkDetails['+index+'].id" width="50px" value="'+id+'"/> '
- // + '<input autocomplete="off" type="number" maxlength="8" style="width: 60px" name="checkDetails['+index+'].actuallySum" width="50px" value="'+actuallySum+'" /> ';
- // return html;
- // } else {
- // return actuallySum;
- // }
- var id = result.id;
- var actuallySum = result.actuallySum;
-
- html += ' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">'+ result.goods.goodsNo + '</h3> </div>'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + result.goods.name + '</h3> </div> '
- +'<div class="am-u-sm-2 "><h3 class="am-list-item-hd">' + result.beginBalance + '</h3> </div> '
- +'<div class="am-u-sm-3 "><input autocomplete="off" type="hidden" name="checkDetails['+i+'].id" width="50px" value="'+id+'"/> <input autocomplete="off" type="number" maxlength="8" style="width: 60px" name="checkDetails['+i+'].actuallySum" width="50px" value="'+actuallySum+'" /></div> ';
- // +'<div class="am-u-sm-2 "><a class="am-list-item-hd" href="'+basePath+'/admin/customer/toVipInfoSearch?id='+ loj.getString(i, "id")+ '&lookInfo=0">查看盘点</a></div></li>';
- }
- return html;
- } else {
- $("#pagingBox").hide();
-
-
- }
- }
- }).serchDate();
-
-
- //筛选点击事件
-
-
-
- $(".m_ul li span").click(function(){
-
- var normal="am-badge am-badge-secondary am-radius";
- var selected="am-badge am-badge-warning am-radius";
- var myAttr= $(this).attr("class");
- if(myAttr==selected){
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",normal);
- Pagination.serchDate();
- }else{
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",selected);
- onserch($(this).attr("kind"),$(this).attr("day"))
- }
-
- });
-
- //下拉框
- MTools.autoFullSelect();
- //
- //style="display:none"
- $(".option1").css("display","none");
- $(".option2").css("display","none");
-
- }
- );
- function option(){
- $(".option").removeAttr("selected");
- $('.time').attr('selected', true);
- if($("#select").val() != null && $("#select").val() != ""){
- if($("#select").val() != "absentDay"){
- $(".option1").css("display","none");
- $(".option2").css("display","block");
- }else{
- $(".option2").css("display","none");
- $(".option1").css("display","block");
- }
- }else{
- $(".option1").css("display","none");
- $(".option2").css("display","none");
- }
- }
-
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/store-check.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/store-check.html
deleted file mode 100644
index a7920bf..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/store-check.html
+++ /dev/null
@@ -1,261 +0,0 @@
-
-
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-<meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport" />
-<title th:text="${session.userInfo.shopName }"></title>
-
-<!-- Set render engine for 360 browser -->
-<meta name="renderer" content="webkit">
-
-<!-- No Baidu Siteapp-->
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-
-
-
-<script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript"
- th:src="@{/js/systools/DDMBase.js}"></script>
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
-<link rel="stylesheet"
- th:href="@{/plugin/amazingUI/css/app.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{/css/dingOrderList.css}">
-<style type="text/css">
-.m_ul{
- list-style: none;
-}
-
-.m_ul li span{
-margin-left: 2em;
-}
-</style>
-</head>
-
-
-
-<body>
- <!-- 商品列表页面 -->
- <div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/personal?foot=1}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class=""> 库存盘点 </a>
- </h1>
-
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main1" id="main" style="display: none;">
- <form class="am-form am-form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="am-form-group am-form-select am-input-group am-input-group-primary am-g title">
- <div class="am-u-sm-6 margin-b1">
- <select class="form-control" name="checkStatus" id="checkStatus" >
- <option value=''>--请选择盘点状态--</option>
- <option value='待审核' >待审核</option>
- <option value='已完成'>已完成</option>
- </select>
- </div>
-<!-- -->
-<!-- <!– <label class="col-sm-2 control-label">会员活跃度</label> –>-->
-<!-- <div class="am-u-sm-6 margin-b1" >-->
-<!-- <select class="form-control autoFull border" -->
-<!-- th:data-url="@{/admin/dataDictionary/showDataDictionary}"-->
-<!-- data-param="{type:'会员活跃度'}" -->
-<!-- data-value="name"-->
-<!-- name="vipState"> -->
-<!-- <option value=''>活跃度</option> -->
-<!-- </select>-->
-<!-- </div>-->
-<!-- <div class="am-u-sm-6 margin-b1">-->
-<!-- <select name="select" id="select" onchange="option()"> -->
-<!-- <option value=''>--类型选择--</option>-->
-<!-- <option value="absentDay">未到店日期</option>-->
-<!-- <option value="birthdays">生日</option>-->
-<!-- <option value="followDays">跟进</option>-->
-<!-- <option value="appointDays">预约</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- <div class="am-u-sm-6 margin-b1">-->
-<!-- <select name="time" id="time">-->
-<!-- <option value='' class="option time">--时间选择--</option>-->
-<!-- <option value="3" class="option option1 ">3天</option>-->
-<!-- <option value="7" class="option option1">7天</option>-->
-<!-- <option value="14" class="option option1">14天</option>-->
-<!-- <option value="1" class="option option2">今天</option>-->
-<!-- <option value="3" class="option option2">3天内</option>-->
-<!-- <option value="30" class="option option2">一个月</option>-->
-<!-- </select>-->
-<!-- </div>-->
-
-<!-- <div class="am-u-sm-8 ">-->
-<!-- <input autocomplete="off" type="text" class="searchIn" name="keyWord" placeholder="用户姓名/手机号" />-->
-
-<!-- </div>-->
- <div class="am-u-sm-4 ">
- <button type="button"
- class="am-btn am-btn-default am-radius searchBtn"
- onclick="Pagination.serchDate()">搜索</button>
- </div>
-
- <!-- 记录当前页 -->
- <input autocomplete="off" type="hidden" name="offset" id="_offset" value="0" />
- <input autocomplete="off" type="hidden" name="limit" id="limit" value="10" />
- </div>
-
-
- <div data-am-widget="list_news"
- class="am-list-news am-list-news-default">
- <!--列表标题-->
- <div class="am-list-news-hd am-cf am-g">
- <!--带更多链接-->
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">盘点编号</h2>
- </div>
- <div class="am-u-sm-3 ">
- <h2 class="am-list-news-more am-fr">盘点时间</h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">制单人</h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">盘点状态</h2>
- </div>
- <div class="am-u-sm-2 ">
- <h2 class="am-list-news-more am-fr">操作</h2>
- </div>
- </div>
- <div class="am-list-news-bd">
- <ul class="am-list am-list-striped" id="showdataBox">
-
- </ul>
- </div>
- <div id="pagingBox" align="center" style="margin-top: 10px"></div>
- </div>
- <!-- 商品展示结束 -->
- <!-- 测试 -->
- </form>
- </div>
- <!-- 订单内容结束 -->
-
- </div>
-
- <script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
- <script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
- <script>
-
- /**
- 加载数据
- **/
- $(function() {
- var pageSize=$("#limit").val();
- Pagination
- .init(
- {
- url : basePath+"/admin/check/showList",
- pageSize : pageSize,
- builderDate : function(loj) {
- if (loj.getRowCount() > 0) {
- $("#main").show();
- var html = "";
- //构建数据
- for (var i = 0; i < loj.getRowCount(); i++) {
- var createTime=' ';
- var status=' ';
- if(loj.getString(i, "createDate")&&loj.getString(i, "createDate")!=''){
- createTime = MGrid.getTime(loj.getString(i, "createDate"));
- }
-
- if(loj.getString(i, "checkStatus")&&loj.getString(i, "checkStatus")!=''){
- createTime = MGrid.getTime(loj.getString(i, "createDate"));
- }
-
- html += ' <li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">'+ loj.getString(i,"checkNo") + '</h3> </div>'
- +'<div class="am-u-sm-3 "><h3 class="am-list-item-hd">' + createTime + '</h3> </div> '
- +'<div class="am-u-sm-2 "><h3 class="am-list-item-hd">' + loj.getString(i,"makingManName") + '</h3> </div> '
- +'<div class="am-u-sm-2 "><h3 class="am-list-item-hd">' + loj.getString(i,"checkStatus") + '</h3> </div> '
- +'<div class="am-u-sm-2 "><a class="am-list-item-hd" href="'+basePath+'/admin/check/toMobileCheckDetail?checkId='+ loj.getString(i, "id")+ '&lookInfo=0">查看盘点</a></div></li>';
- }
- return html;
- } else {
- $("#pagingBox").hide();
-
-
- }
- }
- }).serchDate();
-
-
- //筛选点击事件
-
-
-
- $(".m_ul li span").click(function(){
-
- var normal="am-badge am-badge-secondary am-radius";
- var selected="am-badge am-badge-warning am-radius";
- var myAttr= $(this).attr("class");
- if(myAttr==selected){
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",normal);
- Pagination.serchDate();
- }else{
- $(".m_ul li span").attr("class",normal);
- $(this).attr("class",selected);
- onserch($(this).attr("kind"),$(this).attr("day"))
- }
-
- });
-
- //下拉框
- MTools.autoFullSelect();
- //
- //style="display:none"
- $(".option1").css("display","none");
- $(".option2").css("display","none");
-
- }
- );
- function option(){
- $(".option").removeAttr("selected");
- $('.time').attr('selected', true);
- if($("#select").val() != null && $("#select").val() != ""){
- if($("#select").val() != "absentDay"){
- $(".option1").css("display","none");
- $(".option2").css("display","block");
- }else{
- $(".option2").css("display","none");
- $(".option1").css("display","block");
- }
- }else{
- $(".option1").css("display","none");
- $(".option2").css("display","none");
- }
- }
-
-
-
- </script>
- <!-- index js -->
-</body>
-</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/vip-archives.html b/zq-erp/src/main/resources/templates/views/admin/hive/mobile/vip-archives.html
deleted file mode 100644
index 162f4b7..0000000
--- a/zq-erp/src/main/resources/templates/views/admin/hive/mobile/vip-archives.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!doctype html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
- <meta
- content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
- name="viewport"/>
- <title th:text="${session.userInfo.shopName }"></title>
-
- <!-- Set render engine for 360 browser -->
- <meta name="renderer" content="webkit">
- <script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript" th:src="@{/js/systools/DDMBase.js}"></script>
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/amazeui.min.css}">
- <link rel="stylesheet" th:href="@{/plugin/amazingUI/css/app.css}">
- <link rel="stylesheet" type="text/css" th:href="@{/css/dingUserVip.css}">
- <style type="text/css">
- .loadingbig {
- max-width: 100%;
- }
-
- </style>
-
-</head>
-<script>
-
-</script>
-
-
-<body>
-<!-- 商品列表页面 -->
-<div class="wrap">
- <!-- 头部开始 -->
- <header data-am-widget="header"
- class="am-header color-w back-m1 am-header-fixed">
- <div class="am-header-left am-header-nav">
- <a th:href="@{/admin/redirect/hive/mobile/CRM-account}" class=""> <i
- class="am-header-icon am-icon-chevron-left"></i>
- </a>
- </div>
-
- <h1 class="am-header-title">
- <a href="#title-link" class="">客户档案</a>
- </h1>
-
- </header>
- <!-- 头部结束 -->
-
- <!-- 订单内容 -->
- <div class="main main2" id="app">
- <form class="am-form am-form-horizontal" method="post" id="dataform" onsubmit="javascripr:return false;">
-
- <div class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-12">
- <span class="am-input-group-label ">会员姓名</span>
- </div>
- <div class="am-u-sm-12">
- <input autocomplete="off" type="text" class="am-form-field " th:value="${session.lookVipInfo.vipName}"
- readonly="readonly"/>
- </div>
- </div>
-
-
- <template v-for="question in questions">
- <div v-if="question.type=='标题'"
- class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-12">
- <span class="am-input-group-label">{{question.question}}</span>
- </div>
- </div>
-
-
- <div v-if="question.type=='文本'" class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-12">
- <span class="am-input-group-label">{{question.question}}</span>
- </div>
- <div class="am-u-sm-12">
- <input autocomplete="off" type="text" v-model="question.vipAnswer.answerText" class="am-form-field ">
- </div>
- </div>
-
- <div v-if="question.type=='单选'" class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-12">
- <span class="am-input-group-label">{{question.question}}</span>
- </div>
- <div class="am-u-sm-12">
- <select v-model="question.vipAnswer.answerId">
- <option v-for="item in question.answers" v-bind:value="item.id" >{{item.answer}}</option>
- </select>
- </div>
- </div>
-
- <div v-if="question.type=='多选'" class="am-input-group am-form-group am-input-group-primary am-g bot">
- <div class="am-u-sm-12">
- <span class="am-input-group-label">{{question.question}}</span>
- </div>
- <div class="am-u-sm-12">
- <div class="am-checkbox">
- <template v-for="item in question.answers" >
- <div class="am-checkbox">
- <label>
- <input autocomplete="off" type="checkbox" v-model="question.vipAnswer.answerId" v-bind:value="item.id" > {{item.answer}}
- </label>
- </div>
- </template>
- </div>
- </div>
- </div>
-
-
-
-
- </template>
-
-
- <div class="inputBtn">
- <input autocomplete="off" type="button" @click="submit()" class="am-btn btn-m1 am-radius am-btn-block"
- value="保存"></input>
- </div>
- <!-- 测试 -->
-
- </form>
- </div>
-</div>
-
-<script
- th:src="@{/plugin/amazingUI/js/amazeui.widgets.helper.js}"></script>
-<script th:src="@{/plugin/amazingUI/js/amazeui.min.js}"></script>
-<script th:src="@{/js/systools/mobile/AjaxProxyVue-mobile.js}"></script>
-<script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
-<script>
-
-
- var id = $.query.get("id");
- var app = new Vue({
- el: '#app',
- data: {
- id: id,
- questions: [{
- answers: [{}],
- category: "",
- id: "",
- orderField: "",
- question: "",
- type: "",
- vipAnswer: {vipAnswer:''},
- }]
- },
- created: function () {
- this.loadInfo();
- },
-
- mounted: function () {
-
- },
-
- methods: {
-
-
- loadInfo: function () {
-
- console.log('加载服务器数据');
- var _this = this;
- AjaxProxy.requst({
- async: false,
- url: basePath + '/admin/vipInfo/getVipQuestions?id=' + id,
- callback: function (data) {
- var questions= data.mapInfo.questions;
- for(let i =0;i<questions.length;i++){
- if(questions[i].vipAnswer==null){
- questions[i].vipAnswer={vipAnswer:'',answerId:''};
- }
- if(questions[i].type=='多选'){
- if(questions[i].vipAnswer){
- questions[i].vipAnswer.answerId=questions[i].vipAnswer.answerId.split(",");
- }
- }else if(questions[i].type=='单选'){
- if(questions[i].vipAnswer){
- questions[i].vipAnswer.answerId= parseInt(
- questions[i].vipAnswer.answerId
- ) ;
- }
- }
- }
- _this.questions = questions;
- }
- });
-
-
- }
- ,
- submit: function () {
- console.log("提交");
- let _this = this;
- let vipAnswers=[];
- for(let i=0; i<_this.questions.length ; i++){
- var quesion=_this.questions[i];
-
- let vipAnswer=quesion.vipAnswer.answerId;
- if(quesion.type=='多选'){
- vipAnswer=quesion.vipAnswer.answerId.join(",");
- }
- let obj={
- quesionId:quesion.id,
- vipId:id,
- answerId:vipAnswer,
- answerText:quesion.vipAnswer.answerText,
- }
-
- vipAnswers.push(obj);
- }
- var params = {
- id:id,
- vipAnswers:vipAnswers
- }
-
-
- if (_this.validate(params)) {
- AjaxProxy.requst({
- app: _this,
- data: params,
- url: basePath + '/admin/vipInfo/modifyVipArchives',
- callback: function (data) {
- layer.open({
- content: data.info
- ,time: 2 //2秒后自动关闭
-
- });
- }
- });
- }
- }
- ,
- validate: function (params) {
-
- return true;
- }
- ,
-
-
- },
-
- })
-
-
-</script>
-<!-- index js -->
-</body>
-</html>
diff --git a/zq-erp/src/test/java/com/matrix/JyyTests.java b/zq-erp/src/test/java/com/matrix/JyyTests.java
index 7dec718..bac5650 100644
--- a/zq-erp/src/test/java/com/matrix/JyyTests.java
+++ b/zq-erp/src/test/java/com/matrix/JyyTests.java
@@ -1,43 +1,84 @@
package com.matrix;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.matrix.component.redis.RedisClient;
+import com.matrix.system.common.bean.SysFunction;
import com.matrix.system.hive.service.imp.SysVipInfoServiceImpl;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import com.matrix.system.score.service.ScoreVipDetailService;
import com.matrix.system.shopXcx.dao.ShopOrderV2Dao;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* 测试类示例
- *
+ *
* @author jiangyouyao
* @email 512061637@qq.com
* @date 2019年2月25日
*/
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {ZqErpApplication.class},webEnvironment =SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = {ZqErpApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class JyyTests {
- @Autowired
- private ShopOrderV2Dao shopOrderV2Dao;
+ @Autowired
+ private ShopOrderV2Dao shopOrderV2Dao;
- @Autowired
- ScoreVipDetailDao scoreVipDetailDao;
+ @Autowired
+ ScoreVipDetailDao scoreVipDetailDao;
- @Autowired
- ScoreVipDetailService scoreVipDetailService;
+ @Autowired
+ ScoreVipDetailService scoreVipDetailService;
- @Autowired
- SysVipInfoServiceImpl sysVipInfoService;
+ @Autowired
+ SysVipInfoServiceImpl sysVipInfoService;
+
+ @Autowired
+ RedisClient redisClient;
+
+ @Test
+ public void testRedis() {
+
+ List<SysFunction> fnList = new ArrayList<>();
+ fnList.add(new SysFunction());
+
+ Map map = new HashMap();
+ map.put("a", fnList);
+ redisClient.saveMapValue("map", map);
+
+
+ }
+
+
+ @Test
+ public void testRedis2() {
+
+ String map = redisClient.getCachedValue("map");
+ JSONObject json = JSONUtil.parseObj(map);
+ String a = json.get("a").toString();
+
+
+ JSONArray jsonArray = JSONUtil.parseArray(a);
+ for (int i=0;i<jsonArray.size();i++){
+ SysFunction sysFunction = jsonArray.get(i, SysFunction.class);
+ System.out.println(sysFunction.getHasThisFn());
+ }
-
-
+ }
}
diff --git a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
index e12109a..9868e2b 100644
--- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
+++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysCompany;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.hive.bean.ParameterSettings;
@@ -53,6 +54,16 @@
newSetting1.setCategory("APP设置");
newSettings.add(newSetting1);
+ ParameterSettings newSetting2=new ParameterSettings();
+ newSetting2.setCode(AppConstance.WAREHOUSE_MANAGE_STOCK);
+ newSetting2.setName("是否管理产品库存");
+ newSetting2.setType(1);
+ newSetting2.setCategory("仓库设置");
+ newSettings.add(newSetting2);
+
+
+
+
for (ParameterSettings newSetting : newSettings) {
List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);
if(CollectionUtil.isEmpty(parameterSettings)){
--
Gitblit v1.9.1