高敬炎 2 년 전
부모
커밋
7264969d00
4개의 변경된 파일73개의 추가작업 그리고 14개의 파일을 삭제
  1. 21 0
      .gitignore
  2. 2 2
      config/index.js
  3. 49 11
      pages/release/record.vue
  4. 1 1
      pages/release/release.vue

+ 21 - 0
.gitignore

@@ -178,3 +178,24 @@ Dockerfile
 
 ###node_modules###
 /node_modules/
+unpackage/res/icons/120x120.png
+unpackage/resources/__UNI__DCD13AC/www/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
+unpackage/resources/__UNI__DCD13AC/www/static/mine/set/setavatar.png
+unpackage/resources/__UNI__DCD13AC/www/static/mine/company/zanwu.png
+unpackage/resources/__UNI__DCD13AC/www/static/mine/company/shipinrenzheng.png
+unpackage/resources/__UNI__DCD13AC/www/static/mine/company/Mask@3x.png
+unpackage/resources/__UNI__DCD13AC/www/__uniappchooselocation.js
+unpackage/resources/__UNI__DCD13AC/www/__uniapperror.png
+unpackage/resources/__UNI__DCD13AC/www/__uniappes6.js
+unpackage/resources/__UNI__DCD13AC/www/__uniappopenlocation.js
+unpackage/resources/__UNI__DCD13AC/www/__uniapppicker.js
+unpackage/resources/__UNI__DCD13AC/www/__uniappquill.js
+unpackage/resources/__UNI__DCD13AC/www/__uniappquillimageresize.js
+unpackage/resources/__UNI__DCD13AC/www/__uniappscan.js
+unpackage/resources/__UNI__DCD13AC/www/__uniappsuccess.png
+unpackage/resources/__UNI__DCD13AC/www/__uniappview.html
+unpackage/resources/__UNI__DCD13AC/www/app-config.js
+unpackage/resources/__UNI__DCD13AC/www/app-config-service.js
+unpackage/resources/__UNI__DCD13AC/www/app-service.js
+unpackage/resources/__UNI__DCD13AC/www/app-view.js
+unpackage/resources/__UNI__DCD13AC/www/

+ 2 - 2
config/index.js

@@ -1,11 +1,11 @@
 const dev = {
 	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
-	baseUrlNew: 'https://api.changyuntong56.com',
+	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
 	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.67:8999/',
+	baseUrlNew: 'http://192.168.110.138:8999/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 49 - 11
pages/release/record.vue

@@ -94,16 +94,21 @@
 						<view class="time">{{good.updateDate}}</view>
 						<!-- <view class="car">{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}</view> -->
 					</view>
-					<view class="row5 flex flex-end">
-						<view class="normal" @click.stop="edit(good)" v-if="good.status =='未通过'">编辑</view>
-						<!-- 只有已驳回的任务有编辑-->
-						<view class="normal" @click.stop="del(good)">删除</view>
-						<!-- v-if="good.status!='已通过'" -->
-						<view class="normal" @click.stop="Refresh(good)" v-if="good.status=='已通过'">刷新</view>
-						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='1'&&good.status=='已通过'">
-							隐藏</view>
-						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='2'&&good.status=='已通过'">
-							显示</view>
+					<view style='justify-content: space-between;' class="row5 flex">
+						<!-- <u-icon name="share" @click.stop="share(good)" size="28"></u-icon> -->
+						<view class="normal" @click.stop="share(good)">分享</view>
+						<view class='flex'>
+							<view class="normal" @click.stop="edit(good)" v-if="good.status =='未通过'">编辑</view>
+							<!-- 只有已驳回的任务有编辑-->
+							<view class="normal" @click.stop="del(good)">删除</view>
+							<!-- v-if="good.status!='已通过'" -->
+							<view class="normal" @click.stop="Refresh(good)" v-if="good.status=='已通过'">刷新</view>
+							<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='1'&&good.status=='已通过'">
+								隐藏</view>
+							<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='2'&&good.status=='已通过'">
+								显示</view>	
+						</view>
+						
 					</view>
 				</view>
 			</view>
@@ -113,7 +118,10 @@
 			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="$u.throttle(confirmClick, 1000)"
 			@close="cancelClick" @cancel="cancelClick" class="modal">
 		</u-modal>
-
+		<u-popup :show="isShowCode" @close="isShowCode=false" mode="center" :round='10'>
+			<image :src="currectData.qrCode" mode="widthFix" style="height: auto;"></image>
+			<u-icon style='margin:0 auto;' name="download" @click="download" size="28"></u-icon>
+		</u-popup>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -131,12 +139,14 @@
 		data() {
 			return {
 				keyword: '',
+				isShowCode:false,
 				// isShowStopBtn: false,
 				// isConfirmLoadingBtn:false,
 				// isShowCustomerServiceBtn:false,
 				// isConfirmUnLoadingBtn:false,
 				// isClosedBtn:false,
 				searchKeyWord: '',
+				currectData:{},
 				mescroll: null,
 				id: '',
 				confirmText: '确定',
@@ -227,6 +237,34 @@
 
 		// },
 		methods: {
+			download(){
+				var that = this
+				console.log(this.currectData.qrCode)
+				uni.downloadFile({
+				    url: that.currectData.qrCode, // 这里是我已经请求好的图片数据
+				    success: (res) => {
+				        console.log(res, 'res')
+				        var tempFilePath = res.tempFilePath;
+				        uni.saveImageToPhotosAlbum({ // 然后调用这个方法
+				            filePath: tempFilePath,
+				            success: (res) => {
+				                uni.showToast({
+				                    title: '图片已保存'
+				                })
+				            }
+				        })
+				    },
+				    fail: () => {
+				        uni.showToast({
+				            title: '图片保存失败'
+				        })
+				    }
+				});
+			},
+			share(item){
+				this.currectData=item
+				this.isShowCode=true
+			},
 			statuschange(item) {
 				this.searchType = item.status
 				this.upCallback({

+ 1 - 1
pages/release/release.vue

@@ -114,7 +114,7 @@
 			<view class="row">
 				<view style='width:120px;' class="left">收货方身份证号(选填)</view>
 				<view class="right flex">
-					<input type="number" maxlength="18" placeholder="输入收货人身份证号" class="input"
+					<input maxlength="18" placeholder="输入收货人身份证号" class="input"
 						v-model="dataObj.receiverIdcard" />
 				</view>
 			</view>