webapp / GreenwayWeb

Commit 73ad29f299f57c79216645dd690df27dd5d34c81

Authored by wesley88
1 parent a7bb4f02

1

Inline Side-by-side
Showing 8 changed files with 172 additions and 154 deletions
admin-web-master/dist.zip deleted
View file @a7bb4f0
No preview for this file type
admin-web-master/src/api/newly.js
  View file @73ad29f
1 1 import request from '@/utils/request'
2   -import requestnew from '@/utils/request2'
  2 +// import request from '@/utils/request2'
3 3 // 生成合同附件
4 4 export function dataInprotDocument(data) {
5 5 return request({
... ... @@ -155,7 +155,7 @@ export function cereResourceStrategy(data) {
155 155 // ******商家管理******
156 156 // 列表
157 157 export function cerePlatformMerchant(data) {
158   - return requestnew({
  158 + return request({
159 159 url: '/cerePlatformMerchant/queryByPage',
160 160 method: 'post',
161 161 data
... ... @@ -163,7 +163,7 @@ export function cerePlatformMerchant(data) {
163 163 }
164 164 // 添加
165 165 export function cerePlatformMerchantadd(data) {
166   - return requestnew({
  166 + return request({
167 167 url: '/cerePlatformMerchant/add',
168 168 method: 'post',
169 169 data
... ... @@ -171,7 +171,7 @@ export function cerePlatformMerchantadd(data) {
171 171 }
172 172 // 详情
173 173 export function cerePlatformMerchantinfo(data) {
174   - return requestnew({
  174 + return request({
175 175 url: '/cerePlatformMerchant/queryById',
176 176 method: 'post',
177 177 data
... ... @@ -179,7 +179,7 @@ export function cerePlatformMerchantinfo(data) {
179 179 }
180 180 // 修改
181 181 export function cerePlatformMerchantedit(data) {
182   - return requestnew({
  182 + return request({
183 183 url: '/cerePlatformMerchant/edit',
184 184 method: 'post',
185 185 data
... ...
admin-web-master/src/components/add/addfa.vue
  View file @73ad29f
... ... @@ -12,7 +12,7 @@
12 12 </el-form-item>
13 13 <el-row :gutter="20">
14 14 <el-col :span="24">
15   - <el-form-item label="招商资源管理" prop="shopNumber">
  15 + <el-form-item label="招商资源管理" prop="resourceManagement">
16 16 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
17 17 <div
18 18 style="font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;line-height:20px;background:#F2F3F5;">
... ... @@ -163,6 +163,11 @@
163 163 message: '请填写招商方案名称',
164 164 trigger: 'change'
165 165 }],
  166 + resourceManagement: [{
  167 + required: true,
  168 + message: '请选择招商资源',
  169 + trigger: 'change'
  170 + }]
166 171 },
167 172 };
168 173 },
... ... @@ -254,7 +259,9 @@
254 259 }
255 260 }
256 261 this.AddData = listall
257   -
  262 + if(this.AddData.length>0){
  263 + this.formInline.resourceManagement = '11'
  264 + }
258 265 this.addcl = false
259 266 },
260 267 mingClosecl() {
... ...
admin-web-master/src/components/add/addsam.vue
  View file @73ad29f
... ... @@ -498,7 +498,7 @@
498 498  
499 499 },
500 500 addM(e) {
501   - this.formInline = e
  501 + this.formInline = JSON.parse(JSON.stringify(e))
502 502 this.addMing = true
503 503 },
504 504 closemblist() {
... ... @@ -526,10 +526,15 @@
526 526 this.formInline[index] = c1
527 527 },
528 528 onSubmit() {
529   -
  529 + this.getmb()
530 530 },
531 531 resetting() {
532   -
  532 + this.querymb = {
  533 + pageNumber: 0,
  534 + pageSize: 10,
  535 + isTemplate: '0'
  536 + }
  537 + this.getmb()
533 538 },
534 539 handleSizeChange() {
535 540  
... ...
admin-web-master/src/views/customer/rsaManagement/tanpan.vue
  View file @73ad29f
... ... @@ -42,7 +42,7 @@
42 42 slot-scope="{date, data}">
43 43 {{data.day.split("-").slice(2).join("-")}}
44 44 <div style="overflow: auto;height:55px;">
45   - <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
  45 + <div style="width:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
46 46 <div style="font-size:12px;margin-top:10px;width:48%" >
47 47 {{item.negotiationTime == data.day?item.negotiationResult:''}}
48 48 </div>
... ...
admin-web-master/src/views/detect/admap.vue
  View file @73ad29f
... ... @@ -406,9 +406,15 @@
406 406 this.addcl = true
407 407 },
408 408 chenge(e) {
409   - this.ontype = e
410   - this.pagequery.pageNumber = 0
411   - this.getAll()
  409 + this.ontype = null
  410 + // 延迟一秒执行
  411 + setTimeout(() => {
  412 + this.ontype = e
  413 + this.pagequery.pageNumber = 0
  414 + this.getAll()
  415 + this.$forceUpdate();
  416 + }, 10)
  417 +
412 418 },
413 419 gettime() {
414 420 // 获取当前时间
... ...
admin-web-master/src/views/scheme/sam.vue
  View file @73ad29f
... ... @@ -288,7 +288,7 @@
288 288 },
289 289 data() {
290 290 return {
291   - onaction: '1',
  291 + onaction: '2',
292 292 detailsinfo: {},
293 293 formInline: {},
294 294 upload: uploadUrl,
... ...
lvdao-miniapp/manifest.json
  View file @73ad29f
1 1 {
2   - "name": "绿道",
3   - "appid": "__UNI__F034047",
4   - "description": "",
5   - "versionName": "1.0.2",
6   - "versionCode": "100",
7   - "transformPx": false,
8   - /* 5+App特有相关 */
9   - "app-plus": {
10   - "usingComponents": true,
11   - "nvueCompiler": "uni-app",
12   - "compilerVersion": 3,
13   - "splashscreen": {
14   - "alwaysShowBeforeRender": true,
15   - "waiting": true,
16   - "autoclose": true,
17   - "delay": 0
18   - },
19   - /* 模块配置 */
20   - "modules": {},
21   - /* 应用发布信息 */
22   - "distribute": {
23   - /* android打包配置 */
24   - "android": {
25   - "permissions": [
26   - "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
27   - "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
28   - "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
29   - "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
30   - "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
31   - "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
32   - "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
33   - "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
34   - "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
35   - "<uses-permission android:name=\"android.permission.CAMERA\"/>",
36   - "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
37   - "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
38   - "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
39   - "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
40   - "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
41   - "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
42   - "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
43   - "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
44   - "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
45   - "<uses-feature android:name=\"android.hardware.camera\"/>",
46   - "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
47   - "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
48   - ]
49   - },
50   - /* ios打包配置 */
51   - "ios": {},
52   - /* SDK配置 */
53   - "sdkConfigs": {
54   - "ad": {}
55   - },
56   - "icons": {
57   - "android": {
58   - "hdpi": "unpackage/res/icons/72x72.png",
59   - "xhdpi": "unpackage/res/icons/96x96.png",
60   - "xxhdpi": "unpackage/res/icons/144x144.png",
61   - "xxxhdpi": "unpackage/res/icons/192x192.png"
62   - },
63   - "ios": {
64   - "appstore": "unpackage/res/icons/1024x1024.png",
65   - "ipad": {
66   - "app": "unpackage/res/icons/76x76.png",
67   - "app@2x": "unpackage/res/icons/152x152.png",
68   - "notification": "unpackage/res/icons/20x20.png",
69   - "notification@2x": "unpackage/res/icons/40x40.png",
70   - "proapp@2x": "unpackage/res/icons/167x167.png",
71   - "settings": "unpackage/res/icons/29x29.png",
72   - "settings@2x": "unpackage/res/icons/58x58.png",
73   - "spotlight": "unpackage/res/icons/40x40.png",
74   - "spotlight@2x": "unpackage/res/icons/80x80.png"
75   - },
76   - "iphone": {
77   - "app@2x": "unpackage/res/icons/120x120.png",
78   - "app@3x": "unpackage/res/icons/180x180.png",
79   - "notification@2x": "unpackage/res/icons/40x40.png",
80   - "notification@3x": "unpackage/res/icons/60x60.png",
81   - "settings@2x": "unpackage/res/icons/58x58.png",
82   - "settings@3x": "unpackage/res/icons/87x87.png",
83   - "spotlight@2x": "unpackage/res/icons/80x80.png",
84   - "spotlight@3x": "unpackage/res/icons/120x120.png"
85   - }
86   - }
87   - },
88   - "splashscreen": {
89   - "android": {
90   - "hdpi": "",
91   - "xhdpi": "",
92   - "xxhdpi": ""
93   - },
94   - "androidStyle": "default"
95   - }
96   - }
97   - },
98   - /* 快应用特有相关 */
99   - "quickapp": {},
100   - /* 小程序特有相关 */
101   - "mp-weixin": {
102   - "appid": "wx005c61919377e6af",
103   - "setting": {
104   - "urlCheck": false,
105   - "es6": true,
106   - "postcss": false,
107   - "minified": true
108   - },
109   - "usingComponents": true,
110   - "permission": {}
111   - },
112   - "mp-alipay": {
113   - "usingComponents": true
114   - },
115   - "mp-baidu": {
116   - "usingComponents": true
117   - },
118   - "mp-toutiao": {
119   - "usingComponents": true
120   - },
121   - "h5": {
122   - "router": {
123   - "mode": "hash",
124   - "base": "./"
125   - },
126   - "title": "商城",
127   - "devServer": {
128   - "https": false
129   - },
130   - "domain": "",
131   - "sdkConfigs": {
132   - "maps": {
133   - "qqmap": {
134   - "key": "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
135   - }
136   - }
137   - },
138   - "template": "home.vue"
139   - }
140   -}
141 2 \ No newline at end of file
  3 + "name" : "绿道",
  4 + "appid" : "__UNI__189D96A",
  5 + "description" : "",
  6 + "versionName" : "1.0.2",
  7 + "versionCode" : "100",
  8 + "transformPx" : false,
  9 + /* 5+App特有相关 */
  10 + "app-plus" : {
  11 + "usingComponents" : true,
  12 + "nvueCompiler" : "uni-app",
  13 + "compilerVersion" : 3,
  14 + "splashscreen" : {
  15 + "alwaysShowBeforeRender" : true,
  16 + "waiting" : true,
  17 + "autoclose" : true,
  18 + "delay" : 0
  19 + },
  20 + /* 模块配置 */
  21 + "modules" : {},
  22 + /* 应用发布信息 */
  23 + "distribute" : {
  24 + /* android打包配置 */
  25 + "android" : {
  26 + "permissions" : [
  27 + "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
  28 + "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
  29 + "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
  30 + "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
  31 + "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
  32 + "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
  33 + "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
  34 + "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
  35 + "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
  36 + "<uses-permission android:name=\"android.permission.CAMERA\"/>",
  37 + "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
  38 + "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
  39 + "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
  40 + "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
  41 + "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
  42 + "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
  43 + "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
  44 + "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
  45 + "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
  46 + "<uses-feature android:name=\"android.hardware.camera\"/>",
  47 + "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
  48 + "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
  49 + ]
  50 + },
  51 + /* ios打包配置 */
  52 + "ios" : {},
  53 + /* SDK配置 */
  54 + "sdkConfigs" : {
  55 + "ad" : {}
  56 + },
  57 + "icons" : {
  58 + "android" : {
  59 + "hdpi" : "unpackage/res/icons/72x72.png",
  60 + "xhdpi" : "unpackage/res/icons/96x96.png",
  61 + "xxhdpi" : "unpackage/res/icons/144x144.png",
  62 + "xxxhdpi" : "unpackage/res/icons/192x192.png"
  63 + },
  64 + "ios" : {
  65 + "appstore" : "unpackage/res/icons/1024x1024.png",
  66 + "ipad" : {
  67 + "app" : "unpackage/res/icons/76x76.png",
  68 + "app@2x" : "unpackage/res/icons/152x152.png",
  69 + "notification" : "unpackage/res/icons/20x20.png",
  70 + "notification@2x" : "unpackage/res/icons/40x40.png",
  71 + "proapp@2x" : "unpackage/res/icons/167x167.png",
  72 + "settings" : "unpackage/res/icons/29x29.png",
  73 + "settings@2x" : "unpackage/res/icons/58x58.png",
  74 + "spotlight" : "unpackage/res/icons/40x40.png",
  75 + "spotlight@2x" : "unpackage/res/icons/80x80.png"
  76 + },
  77 + "iphone" : {
  78 + "app@2x" : "unpackage/res/icons/120x120.png",
  79 + "app@3x" : "unpackage/res/icons/180x180.png",
  80 + "notification@2x" : "unpackage/res/icons/40x40.png",
  81 + "notification@3x" : "unpackage/res/icons/60x60.png",
  82 + "settings@2x" : "unpackage/res/icons/58x58.png",
  83 + "settings@3x" : "unpackage/res/icons/87x87.png",
  84 + "spotlight@2x" : "unpackage/res/icons/80x80.png",
  85 + "spotlight@3x" : "unpackage/res/icons/120x120.png"
  86 + }
  87 + }
  88 + },
  89 + "splashscreen" : {
  90 + "android" : {
  91 + "hdpi" : "",
  92 + "xhdpi" : "",
  93 + "xxhdpi" : ""
  94 + },
  95 + "androidStyle" : "default"
  96 + }
  97 + }
  98 + },
  99 + /* 快应用特有相关 */
  100 + "quickapp" : {},
  101 + /* 小程序特有相关 */
  102 + "mp-weixin" : {
  103 + "appid" : "wx005c61919377e6af",
  104 + "setting" : {
  105 + "urlCheck" : false,
  106 + "es6" : true,
  107 + "postcss" : false,
  108 + "minified" : true
  109 + },
  110 + "usingComponents" : true,
  111 + "permission" : {}
  112 + },
  113 + "mp-alipay" : {
  114 + "usingComponents" : true
  115 + },
  116 + "mp-baidu" : {
  117 + "usingComponents" : true
  118 + },
  119 + "mp-toutiao" : {
  120 + "usingComponents" : true
  121 + },
  122 + "h5" : {
  123 + "router" : {
  124 + "mode" : "hash",
  125 + "base" : "./"
  126 + },
  127 + "title" : "商城",
  128 + "devServer" : {
  129 + "https" : false
  130 + },
  131 + "domain" : "",
  132 + "sdkConfigs" : {
  133 + "maps" : {
  134 + "qqmap" : {
  135 + "key" : "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
  136 + }
  137 + }
  138 + },
  139 + "template" : "home.vue"
  140 + }
  141 +}
... ...