版本提交

@@ -8,20 +8,20 @@
  */
  */
 
 
 module.exports = {
 module.exports = {
-	"enabledQcloud": false, //是否开启腾讯云COS 上传功能
-	// 腾讯云COS 上传功能配置表
-	"qcloud": {
-		"appid": "wxc57ed87f2569f701",
-		"secretId": "xxx",
-		"secretKey": "xxxxx",
-		"bucket": "xxxx",
-		"region": "sh",
-		"prefix": "what-ever/you-want",
-		"overWrite": true,
-		"headers": {
-			"Cache-Control": "max-age=5184000"
-		}
-	},
-	// 静态资源CDN 域名，配合CDN 功能实用，线上请确保在mp管理端已经注册域名
-	"assetsCDN": "https://res.jianhui.org/"
+  "enabledQcloud": false, //是否开启腾讯云COS 上传功能
+  // 腾讯云COS 上传功能配置表
+  "qcloud": {
+    "appid": "wx61c217d6f1553ccc",
+    "secretId": "xxx",
+    "secretKey": "xxxxx",
+    "bucket": "xxxx",
+    "region": "sh",
+    "prefix": "/weapp/marubi/wish-list",
+    "overWrite": true,
+    "headers": {
+      "Cache-Control": "max-age=5184000"
+    }
+  },
+  // 静态资源CDN 域名，配合CDN 功能实用，线上请确保在mp管理端已经注册域名
+  "assetsCDN": "https://kdcdn.oss-cn-shenzhen.aliyuncs.com"
 };
 };

@@ -27,275 +27,285 @@ var config = null;
 
 
 // 获取用户配置
 // 获取用户配置
 try {
 try {
-	config = require('./config.custom.js');
+  config = require('./config.custom.js');
 } catch (e) {
 } catch (e) {
-	try {
-		config = require('./config.js');
-	} catch (e) {
-		log(gutil.colors.red('丢失配置文件(config.js/config.custom.js)'));
-	}
+  try {
+    config = require('./config.js');
+  } catch (e) {
+    log(gutil.colors.red('丢失配置文件(config.js/config.custom.js)'));
+  }
 }
 }
 
 
 // 相关路径配置
 // 相关路径配置
 var paths = {
 var paths = {
-	src: {
-		baseDir: 'src',
-		imgDir: 'src/image',
-		spriteDir: 'src/assets/sprites',
-		scssDir: 'src/assets/scss',
-		imgFiles: 'src/image/**/*',
-		scssFiles: 'src/**/*.scss',
-		baseFiles: ['src/**/*.{png,js,json,wxml,wxss,wxs,ts,woff2}', '!src/assets/**/*', '!src/image/**/*'],
-		assetsDir: 'src/assets',
-		assetsImgFiles: 'src/assets/images/**/*.{png,jpg,jpeg,svg,gif}',
-		wxmlFiles: ['src/**/*.wxml'],
-		jsFiles: 'src/**/*.js'
-	},
-	dist: {
-		baseDir: 'dist',
-		imgDir: 'dist/image',
-		wxssFiles: 'dist/**/*.wxss',
-	},
-	tmp: {
-		baseDir: 'tmp',
-		imgDir: 'tmp/assets/images',
-		imgFiles: 'tmp/assets/images/**/*.{png,jpg,jpeg,svg,gif}'
-	}
+  src: {
+    baseDir: 'src',
+    imgDir: 'src/image',
+    spriteDir: 'src/assets/sprites',
+    scssDir: 'src/assets/scss',
+    imgFiles: 'src/image/**/*',
+    scssFiles: 'src/**/*.scss',
+    baseFiles: ['src/**/*.{png,js,json,wxml,wxss,wxs,ts,woff2}', '!src/assets/**/*', '!src/image/**/*'],
+    targetFiles: ['src/**/*.{png,js,json}', '!src/assets/**/*', '!src/image/**/*'], //modify 观察时只复制部分，baseFiles是为了涵盖其他第三方引用，如ui
+    assetsDir: 'src/assets',
+    assetsImgFiles: 'src/assets/images/**/*.{png,jpg,jpeg,svg,gif}',
+    wxmlFiles: ['src/**/*.wxml'],
+    jsFiles: 'src/**/*.js'
+  },
+  dist: {
+    baseDir: 'dist',
+    imgDir: 'dist/image',
+    wxssFiles: 'dist/**/*.wxss',
+  },
+  tmp: {
+    baseDir: 'tmp',
+    imgDir: 'tmp/assets/images',
+    imgFiles: 'tmp/assets/images/**/*.{png,jpg,jpeg,svg,gif}'
+  }
 };
 };
 
 
 // 雪碧图的配置
 // 雪碧图的配置
 var lazyspriteConfig = {
 var lazyspriteConfig = {
-	imagePath: paths.src.spriteDir,
-	stylesheetInput: paths.src.scssDir,
-	stylesheetRelative: paths.src.assetsDir,
-	spritePath: paths.src.assetsDir + '/images',
-	smartUpdate: false,
-	cssSeparator: '-',
-	outputExtralCSS: true,
-	nameSpace: 'icon-'
+  imagePath: paths.src.spriteDir,
+  stylesheetInput: paths.src.scssDir,
+  stylesheetRelative: paths.src.assetsDir,
+  spritePath: paths.src.assetsDir + '/images',
+  smartUpdate: false,
+  cssSeparator: '-',
+  outputExtralCSS: true,
+  nameSpace: 'icon-'
 };
 };
 
 
 // Log for output msg.
 // Log for output msg.
 function log() {
 function log() {
-	var data = Array.prototype.slice.call(arguments);
-	gutil.log.apply(false, data);
+  var data = Array.prototype.slice.call(arguments);
+  gutil.log.apply(false, data);
 }
 }
 
 
 // 压缩图片
 // 压缩图片
 function imageMin() {
 function imageMin() {
-	// return gulp.src(paths.src.imgFiles, {si≤nce: gulp.lastRun(imageMin)})
-	return gulp.src(paths.src.imgFiles)
-		.pipe(newer(paths.dist.imgDir))
-		.pipe(imagemin({
-			progressive: true,
-			svgoPlugins: [{
-				removeViewBox: false
-			}]
-		}))
-		.pipe(gulp.dest(paths.dist.imgDir));
+  // return gulp.src(paths.src.imgFiles, {si≤nce: gulp.lastRun(imageMin)})
+  return gulp.src(paths.src.imgFiles)
+    .pipe(newer(paths.dist.imgDir))
+    .pipe(imagemin({
+      progressive: true,
+      svgoPlugins: [{
+        removeViewBox: false
+      }]
+    }))
+    .pipe(gulp.dest(paths.dist.imgDir));
 }
 }
 
 
 // assets 文件夹下的图片处理
 // assets 文件夹下的图片处理
 function assetsImgMin() {
 function assetsImgMin() {
-	return gulp.src(paths.src.assetsImgFiles)
-		.pipe(newer(paths.tmp.imgDir))
-		.pipe(imagemin({
-			progressive: true,
-			svgoPlugins: [{
-				removeViewBox: false
-			}]
-		}))
-		.pipe(gulp.dest(paths.tmp.imgDir))
+  return gulp.src(paths.src.assetsImgFiles)
+    .pipe(newer(paths.tmp.imgDir))
+    .pipe(imagemin({
+      progressive: true,
+      svgoPlugins: [{
+        removeViewBox: false
+      }]
+    }))
+    .pipe(gulp.dest(paths.tmp.imgDir))
 }
 }
 
 
 // Sass 编译
 // Sass 编译
 function sassCompile() {
 function sassCompile() {
-	var res = config.assetsCDN + config.qcloud.prefix + '/';
-	// 缩放比例 1为750
-	var pxtorpxOpts = {
-		times: 1
-	};
-	return gulp.src(paths.src.scssFiles)
-		.pipe(sass({
-				errLogToConsole: true,
-				outputStyle: 'expanded'
-			})
-			.on('error', sass.logError))
-		.pipe(gulpif(Boolean(argv.debug), debug({
-			title: '`sassCompile` Debug:'
-		})))
-		// .pipe(postcss([lazysprite(lazyspriteConfig), pxtorpx(pxtorpxOpts), base64()]))
-		.pipe(postcss([pxtorpx(pxtorpxOpts)]))
-		.pipe(rename({
-			'extname': '.wxss'
-		}))
-		.pipe(replace('.scss', '.wxss'))
-		.pipe(replace('%ASSETS_IMG%/', res))
-		.pipe(replace('src/assets/images', res)) // 雪碧图CSS RUL 中的图片路径
-		.pipe(gulp.dest(paths.dist.baseDir))
+  var res = config.assetsCDN + config.qcloud.prefix + '/';
+  // 缩放比例 1为750
+  var pxtorpxOpts = {
+    times: 1
+  };
+  return gulp.src(paths.src.scssFiles)
+    .pipe(sass({
+        errLogToConsole: true,
+        outputStyle: 'expanded'
+      })
+      .on('error', sass.logError))
+    .pipe(gulpif(Boolean(argv.debug), debug({
+      title: '`sassCompile` Debug:'
+    })))
+    // .pipe(postcss([lazysprite(lazyspriteConfig), pxtorpx(pxtorpxOpts), base64()]))
+    .pipe(postcss([pxtorpx(pxtorpxOpts)]))
+    .pipe(rename({
+      'extname': '.wxss'
+    }))
+    .pipe(replace('.scss', '.wxss'))
+    // .pipe(replace('%ASSETS_IMG%/', res))
+    .pipe(replace('../../image/oss/', res)) // 自定义图片地址
+    .pipe(replace('src/assets/images', res)) // 雪碧图CSS RUL 中的图片路径
+    .pipe(gulp.dest(paths.dist.baseDir))
 }
 }
 
 
 
 
 // 复制基础文件
 // 复制基础文件
 function copyBasicFiles() {
 function copyBasicFiles() {
-	return gulp.src(paths.src.baseFiles, {})
-		.pipe(gulp.dest(paths.dist.baseDir));
+  return gulp.src(paths.src.baseFiles, {})
+    .pipe(gulp.dest(paths.dist.baseDir));
+}
+
+// 复制基础文件 modify
+function copyTargetFiles() {
+  return gulp.src(paths.src.targetFiles, {})
+    .pipe(gulp.dest(paths.dist.baseDir));
 }
 }
 
 
 // 复制 WXML
 // 复制 WXML
 function copyWXML() {
 function copyWXML() {
-	return gulp.src(paths.src.wxmlFiles, {})
-		.pipe(gulp.dest(paths.dist.baseDir));
+  return gulp.src(paths.src.wxmlFiles, {})
+    .pipe(gulp.dest(paths.dist.baseDir));
 }
 }
 
 
 
 
 // 重写WXML 中 image 标签中的图片路径
 // 重写WXML 中 image 标签中的图片路径
 function wxmlImgRewrite() {
 function wxmlImgRewrite() {
-	var res = config.assetsCDN + config.qcloud.prefix + '/';
-	// console.log(res);
-	return gulp.src(paths.src.wxmlFiles)
-		.pipe(replace('%ASSETS_IMG%/', res))
-		.pipe(gulp.dest(paths.dist.baseDir))
+  var res = config.assetsCDN + config.qcloud.prefix + '/';
+  // console.log(res);
+  return gulp.src(paths.src.wxmlFiles)
+    // .pipe(replace('%ASSETS_IMG%/', res))
+    .pipe(replace('../../image/oss/', res))
+    .pipe(gulp.dest(paths.dist.baseDir))
 }
 }
 
 
 // clean 任务, dist 目录
 // clean 任务, dist 目录
 function cleanDist() {
 function cleanDist() {
-	return del(paths.dist.baseDir);
+  return del(paths.dist.baseDir);
 }
 }
 
 
 // clean tmp 目录
 // clean tmp 目录
 function cleanTmp() {
 function cleanTmp() {
-	return del(paths.tmp.baseDir);
+  return del(paths.tmp.baseDir);
 }
 }
 
 
 // 腾讯云上传任务
 // 腾讯云上传任务
 function qcloudCDN(cb) {
 function qcloudCDN(cb) {
-	if (config.enabledQcloud) {
-		// return gulp.src(paths.src.assetsImgFiles, {since: gulp.lastRun(qcloudCDN)})
-		return gulp.src(paths.tmp.imgFiles)
-			.pipe(cache('qcloudCache'))
-			.pipe(qcloudUpload({
-				appid: config.qcloud.appid,
-				secretId: config.qcloud.secretId,
-				secretKey: config.qcloud.secretKey,
-				bucket: config.qcloud.bucket,
-				region: config.qcloud.region,
-				prefix: config.qcloud.prefix,
-				overWrite: config.qcloud.overWrite,
-				headers: config.qcloud.headers
-			}));
-	}
-	cb();
+  if (config.enabledQcloud) {
+    // return gulp.src(paths.src.assetsImgFiles, {since: gulp.lastRun(qcloudCDN)})
+    return gulp.src(paths.tmp.imgFiles)
+      .pipe(cache('qcloudCache'))
+      .pipe(qcloudUpload({
+        appid: config.qcloud.appid,
+        secretId: config.qcloud.secretId,
+        secretKey: config.qcloud.secretKey,
+        bucket: config.qcloud.bucket,
+        region: config.qcloud.region,
+        prefix: config.qcloud.prefix,
+        overWrite: config.qcloud.overWrite,
+        headers: config.qcloud.headers
+      }));
+  }
+  cb();
 }
 }
 
 
 
 
 var watchHandler = function (type, file) {
 var watchHandler = function (type, file) {
-	var extname = path.extname(file);
-	// SCSS 文件
-	if (extname === '.scss') {
-		if (type === 'removed') {
-			var tmp = file.replace('src/', 'dist/').replace(extname, '.wxss');
-			del([tmp]);
-		} else {
-			sassCompile();
-		}
-	}
-	// 图片文件
-	else if (extname === '.png' || extname === '.jpg' || extname === '.jpeg' || extname === '.svg' || extname === '.gif') {
-		if (type === 'removed') {
-			if (file.indexOf('assets') > -1) {
-				del([file.replace('src/', 'tmp/')]);
-			} else {
-				del([file.replace('src/', 'dist/')]);
-			}
-		} else {
-			imageMin();
-			assetsImgMin();
-			qcloudCDN();
-			wxmlImgRewrite();
-		}
-	}
+  var extname = path.extname(file);
+  // SCSS 文件
+  if (extname === '.scss') {
+    if (type === 'removed') {
+      var tmp = file.replace('src/', 'dist/').replace(extname, '.wxss');
+      del([tmp]);
+    } else {
+      sassCompile();
+    }
+  }
+  // 图片文件
+  else if (extname === '.png' || extname === '.jpg' || extname === '.jpeg' || extname === '.svg' || extname === '.gif') {
+    if (type === 'removed') {
+      if (file.indexOf('assets') > -1) {
+        del([file.replace('src/', 'tmp/')]);
+      } else {
+        del([file.replace('src/', 'dist/')]);
+      }
+    } else {
+      imageMin();
+      assetsImgMin();
+      qcloudCDN();
+      wxmlImgRewrite();
+    }
+  }
 
 
-	// wxml
-	else if (extname === '.wxml') {
-		if (type === 'removed') {
-			var tmp = file.replace('src/', 'dist/')
-			del([tmp]);
-		} else {
-			copyWXML();
-			wxmlImgRewrite();
-		}
-	}
+  // wxml
+  else if (extname === '.wxml') {
+    if (type === 'removed') {
+      var tmp = file.replace('src/', 'dist/')
+      del([tmp]);
+    } else {
+      copyWXML();
+      wxmlImgRewrite();
+    }
+  }
 
 
-	// 其余文件
-	else {
-		if (type === 'removed') {
-			var tmp = file.replace('src/', 'dist/');
-			del([tmp]);
-		} else {
-			copyBasicFiles();
-			// copyWXML();
-			// wxmlImgRewrite();
-		}
-	}
+  // 其余文件
+  else {
+    if (type === 'removed') {
+      var tmp = file.replace('src/', 'dist/');
+      del([tmp]);
+    } else {
+      copyTargetFiles(); // modify
+      // copyBasicFiles();
+      // copyWXML();
+      // wxmlImgRewrite();
+    }
+  }
 };
 };
 
 
 //监听文件
 //监听文件
 function watch(cb) {
 function watch(cb) {
-	var watcher = gulp.watch([
-		paths.src.baseDir,
-		paths.tmp.imgDir
-	], {
-		ignored: /[\/\\]\./
-	});
-	watcher
-		.on('change', function (file) {
-			log(gutil.colors.yellow(file) + ' is changed');
-			watchHandler('changed', file);
-		})
-		.on('add', function (file) {
-			log(gutil.colors.yellow(file) + ' is added');
-			watchHandler('add', file);
-		})
-		.on('unlink', function (file) {
-			log(gutil.colors.yellow(file) + ' is deleted');
-			watchHandler('removed', file);
-		});
+  var watcher = gulp.watch([
+    paths.src.baseDir,
+    paths.tmp.imgDir
+  ], {
+    ignored: /[\/\\]\./
+  });
+  watcher
+    .on('change', function (file) {
+      log(gutil.colors.yellow(file) + ' is changed');
+      watchHandler('changed', file);
+    })
+    .on('add', function (file) {
+      log(gutil.colors.yellow(file) + ' is added');
+      watchHandler('add', file);
+    })
+    .on('unlink', function (file) {
+      log(gutil.colors.yellow(file) + ' is deleted');
+      watchHandler('removed', file);
+    });
 
 
-	cb();
+  cb();
 }
 }
 
 
 //注册默认任务
 //注册默认任务
 gulp.task('default', gulp.series(
 gulp.task('default', gulp.series(
-	cleanTmp,
-	copyBasicFiles,
-	gulp.parallel(
-		sassCompile,
-		imageMin,
-		copyWXML
-	),
-	wxmlImgRewrite,
-	assetsImgMin,
-	qcloudCDN,
-	watch
+  cleanTmp,
+  copyBasicFiles,
+  gulp.parallel(
+    sassCompile,
+    imageMin,
+    copyWXML
+  ),
+  wxmlImgRewrite,
+  assetsImgMin,
+  qcloudCDN,
+  watch
 ));
 ));
 
 
 //注册测试任务
 //注册测试任务
 gulp.task('test', gulp.series(
 gulp.task('test', gulp.series(
-	cleanTmp,
-	copyBasicFiles,
-	gulp.parallel(
-		sassCompile,
-		imageMin,
-		copyWXML
-	),
-	wxmlImgRewrite,
-	assetsImgMin,
-	qcloudCDN
+  cleanTmp,
+  copyBasicFiles,
+  gulp.parallel(
+    sassCompile,
+    imageMin,
+    copyWXML
+  ),
+  wxmlImgRewrite,
+  assetsImgMin,
+  qcloudCDN
 ));
 ));
 
 
 // 删除任务
 // 删除任务
 gulp.task('clean', gulp.parallel(
 gulp.task('clean', gulp.parallel(
-	cleanTmp,
-	cleanDist
+  cleanTmp,
+  cleanDist
 ));
 ));

 {
 {
   "pages": [
   "pages": [
+    "pages/index/index",
     "pages/prize-detail/prize-detail",
     "pages/prize-detail/prize-detail",
     "pages/user-table/user-table",
     "pages/user-table/user-table",
-    "pages/index/index",
     "pages/authorize/authorize",
     "pages/authorize/authorize",
     "pages/coop/coop",
     "pages/coop/coop",
     "pages/register/register",
     "pages/register/register",

@@ -116,3 +116,15 @@
 .van-popup {
 .van-popup {
   background-color: transparent !important;
   background-color: transparent !important;
 }
 }
+
+
+button {
+  border: none;
+  margin: 0;
+  padding: 0;
+}
+
+button::after {
+  border: none;
+}
+

@@ -166,14 +166,15 @@ Page({
           y: 0,
           y: 0,
           url: '../../image/draw/draw-c1.png',
           url: '../../image/draw/draw-c1.png',
         },
         },
-        // // 头像
-        // {
-        //   width: 102,
-        //   height: 102,
-        //   x: 35,
-        //   y: 700,
-        //   url: userInfo.avatar,
-        // },
+        // 头像
+        {
+          width: 102,
+          height: 102,
+          x: 35,
+          y: 779,
+          borderRadius: 102,
+          url: userInfo.avatar,
+        },
         // 小程序码
         // 小程序码
         {
         {
           width: 118,
           width: 118,