ruanzb 4 years ago
parent
commit
5ca96aa26f
5 changed files with 25 additions and 13 deletions
  1. 6 5
      assets/http/api.js
  2. 2 2
      assets/http/global.js
  3. 6 0
      pages.json
  4. 11 6
      pages/mine/setting/setting.vue
  5. BIN
      static/setting/location.png

+ 6 - 5
assets/http/api.js

@@ -10,10 +10,7 @@ const wxApp={
 const dict=p => http.get('/blade-system/dict-biz/dictionary', {params:p})
 
 //文件上传
-let uploadFileUrl='/upload/putfile'
-const uploadFile={
-	submit:p => http.upload(uploadFileUrl, {name:'file',filePath:p}),
-}
+const uploadFile =(p)=> http.upload('blade-resource/oss/endpoint/put-file', {name:'file',filePath:p})
 
 //活动管理
 const activity = {
@@ -68,6 +65,9 @@ const billRecord={
 	submit:p => http.post('cyzh-ldt/billrecord/submit', p),
 }
 
+const setting = {
+	feedback: p => http.post('feedback/submit', p)
+}
 
 export const api={
 	wxApp,
@@ -81,5 +81,6 @@ export const api={
 	agenterType,
 	userBank,
 	pay,
-	billRecord
+	billRecord,
+	setting
 }

+ 2 - 2
assets/http/global.js

@@ -1,7 +1,7 @@
 let global = {}
 
-// global.baseUrl='http://localhost:2539/'
-global.baseUrl='https://ldt.guosen-fumao.cn/api/'
+global.baseUrl='http://192.168.1.244:1888/api/'
+// global.baseUrl='https://ldt.guosen-fumao.cn/api/'
 
 global.tokenUrl=global.baseUrl+ 'blade-auth/oauth/token?tenantId=000000&password=f67e0b29283bb804f96e28f43ddce79f&username=admin'
 

+ 6 - 0
pages.json

@@ -183,6 +183,12 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "pages/mine/setting/question",
+			"style": {
+				"navigationBarTitleText": "问题反馈",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 	"tabBar": {

+ 11 - 6
pages/mine/setting/setting.vue

@@ -10,6 +10,7 @@
 			<view class="">
 				<text class="cuIcon-right"></text>
 			</view>
+			<button v-if="item.name=='官方客服'" hover-class="none" open-type="contact" show-message-card="true"></button>
 		</view>
 	</view>
 </template>
@@ -24,11 +25,6 @@
 						name:'个人资料',
 						path:'/pages/mine/myInfo'
 					},
-					{
-						icon:'/static/setting/location.png',
-						name:'地址管理',
-						path:''
-					},
 					{
 						icon:'/static/setting/kefu.png',
 						name:'官方客服',
@@ -37,7 +33,7 @@
 					{
 						icon:'/static/setting/tousu.png',
 						name:'投诉及反馈',
-						path:''
+						path:'/pages/mine/setting/question'
 					}
 				]
 			}
@@ -59,5 +55,14 @@
 		margin: 20rpx 0;
 		padding: 30rpx;
 		background-color: #FFFFFF;
+		position: relative;
+		button{
+			position: absolute;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			background-color: transparent;
+		}
 	}
 </style>

BIN
static/setting/location.png