diff --git a/config.js b/config.js index b1318ce..5614c97 100644 --- a/config.js +++ b/config.js @@ -4,7 +4,8 @@ module.exports = { TEST_LOGIN:"https://t-jn-development-manager.jsszkd.com/login", // ?clientId= // baseUrl: "https://t-jn-bjh-admin-server.jsszkd.com", baseUrl: "https://bjh.jndz.cn/bjh-admin-server", - // baseUrl: "http://192.168.0.108:9037", + // baseUrl: "http://192.168.0.107:9037", + // baseUrl: "http://10.236.2.28:54567/bjh-admin-server", // 应用信息 appInfo: { diff --git a/manifest.json b/manifest.json index d1a1a0d..11e6ab5 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "江宁城管app", - "appid" : "__UNI__9199720", + "appid" : "__UNI__722F3C8", "description" : "", "versionName" : "1.1.0", "versionCode" : "100", diff --git a/pages/index.vue b/pages/index.vue index 1e59324..f6e7f3e 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -110,7 +110,7 @@ export default { }, // 其他配置... onBackPress(options) { - console.log("返回", options); + // console.log("返回", options); if (options.from == "backbutton" || options.from == "navigateBack") { // 处理物理返回键或屏幕滑动返回手势 uni.showModal({ @@ -140,7 +140,7 @@ export default { }, mounted() { this.userInfo = uni.getStorageSync("userInfo"); - console.log(JSON.stringify(this.userInfo), "用户信息"); + // console.log(JSON.stringify(this.userInfo), "用户信息"); const currentDate = new Date(); const year = currentDate.getFullYear(); // 获取当前年份 const month = currentDate.getMonth() + 1; // 获取当前月份(注意月份从0开始,需要加1) diff --git a/static/images/delete.png b/static/images/delete.png new file mode 100644 index 0000000..e0e6447 Binary files /dev/null and b/static/images/delete.png differ diff --git a/static/images/delete2.png b/static/images/delete2.png new file mode 100644 index 0000000..34c56f6 Binary files /dev/null and b/static/images/delete2.png differ diff --git a/subEnterprise/activity/activity.vue b/subEnterprise/activity/activity.vue index 3d07ef3..5a867df 100644 --- a/subEnterprise/activity/activity.vue +++ b/subEnterprise/activity/activity.vue @@ -16,6 +16,40 @@ + + + + 活动名称: + + + 店铺周年庆 + + + + + 活动内容: + + + 消费满500元打8折 + + + + + 活动地点: + + + 南京市江宁区佳湖西路19号 + + + + + 参与条件: + + + 所有人可参加 + + + @@ -151,6 +185,22 @@ &>.list-item:last-child { margin-bottom: 0; } + + .yingfuDom { + padding: 20rpx 0; + display: grid; + grid-template-columns: 1fr; + row-gap: 10rpx; + .items{ + display: flex; + .label { + + } + .value { + + } + } + } } diff --git a/subEnterprise/msg/index.vue b/subEnterprise/msg/index.vue index b8525c5..56be452 100644 --- a/subEnterprise/msg/index.vue +++ b/subEnterprise/msg/index.vue @@ -1,11 +1,11 @@